...
fix merge classes