solving merge problems