Code Editor : el-conflict