removing last line from MergeConflict