fixed mistake in conflict resoltion