merging error. trying to fix so 02ArrayList contains my .java file instead of my .class file