Code Editor : merge-conflicts