weird merge problems