updated dep grunt
updated test, merges folder might not be created in the future