changed to a grunt-init template
fix merge conflict