Some merge fixing.