mergeConflict.txt back to first version