case classes fix
merge