undo overkill from Grunt that interferes w/ merges