Merge after last commit from another machine