Adding fix so this won't block GUIs

GUIs got blocked trying to resolve files from a merge conflict because it couldn't find the command.
Bumping gemspec