local merge
merge remote