fixed a mistake in my merge conflict resolution