More merge problem fixes