add-resume-feature-to-update-command

### Changelog
* added merge conflict error to update command
:+1: for adding this test!