Fix mistake in merge conflict.