- Adding .class files to avoid the MERGE FAILED