More merge trouble