clean up files and extraneous files
remove last traces of headshot
correct merge conflicts