Better update method that handles write conflics when sync-ing with
server.