Fix mistake in merge