Added Git Conflict Resolver
Change the details to /tags rather than /tree/master
Merge pull request #2675 from Zeeker/master

Added Git Conflict Resolver