add-resume-feature-to-update-command

### Changelog
* added merge conflict error to update command
add check for the error class as well as the error message.

```ruby
expect { cli.update }.to raise_error(MergeError, "REPLACE_ME: text of error message")
```