kill grunt
merge fix