fix mistake in merge