merge2
resolved fetch and merge