repair grunt task
merge