merge in changes file from a different machine