Gruntification2 with manual merge