pull
fixed conflict
hapus .class files