a bunch of class files before a merge
merge