Add in grunt generated files after merge