Improved conflict resolution message

removed test-generated npm-debug.log

fixed semver formatting in message
Merge pull request #1188 from chiester/wip-1187-conflictResolvedMessage

Improved conflict resolution message