added try and catch for stop in order to complete uninstall even if merging and reporting fails
Merge remote-tracking branch 'origin/master'