Up to grunt 0.4
Fix conflict