ignore fix
delete .class
merge