refactor merge problems