Oops, mistake in merge