aaaaand git fucked up by thinking it had to merge .class files. Oh
goodie.