some merge problems resolved