Code Editor : git-merge-recursive