Removes merge conflict clutter