these files are generated by grunt build, causing conflicts in git