Fixed mistake in the merge