uptodated with server
conflict resolved
conflict again solved