fixing some merge problems