More merge issues...