add from local
merge from local