Code Editor : conflicts