Some merge problems fixed