Remove mistake in merging