finalise classes
merge