fix issues with grunt file due to merging branches