mistake in merge fixed