meta files
Merge conflicts -- meta files, etc etc