fixed some merge problems