add-resume-feature-to-update-command

### Changelog
* added merge conflict error to update command
Thor requires a space at the end of the string in order to merge next `say` string onto the same line