class files
merge conflicts