Fixed mistake in merge.