Fix merge of classes.