merge local changes with remote changes