solving merge trouble