Removed last line from MergeConflicts (1.4)