pushing the classes
resolved merging problems