modify admin and manager
conflict solved