update from local
conflict settled
conflict settled