add from local
merge remote and local