fixed merge problems