Code Editor : git-merge-resolve