Improved conflict resolution message

removed test-generated npm-debug.log

fixed semver formatting in message