Code Editor : merge-strategies.txt