remove merge problems