refix merge conflict classes