add login control
conflict solved