Revert "seperated merge from classification"

This reverts commit c88bdeb7863e6630bbbd5c271d7c871e6d2dfc1f.