try merge2
resolved