merge 2 Mac
resolved fetch and merge