Swapped output method to grunt.log.ok
Fixed merge conflict