merged changes from another machine