ran grunt to min files after rebase resolving conflict