Merge 2 mac
resolve fetch and merge