merge 2 laptop
resolved fetch and merge