merge 2 mac
resolved fetch merge