switched to grunt workflow
merged old files