merge and map fixes