Merge classes
Merge again