Fix mistake in merge resolution

bad programmer did not test merge, no cookie.