removes merge conflict stuff