Fixed mistake in merge