Corrected .metadeta file conflicts, removed extra files, etc. (these metadata files should actually be ignored anyway)