move CheckClassAdapter to after merge