removed dummy user swith code
resolved conflicts