Fix merge confliuct in Gruntfile.js