modify locally
merge remote