class files
more conflicts