fixed mistake in merging.