add-resume-feature-to-update-command

### Changelog
* added merge conflict error to update command
yeah I thought that is why we would want it in there so when you run the integrate command and the update errors then it will just tell them to rerun the command again with the --resume flag. Although that is also going to happen if they just do a plain update command and it errors out is there a way to do a conditional depending on which command they ran give them a different error message?