More merge fixing