resolved conflict of duplicated create user
Merge remote-tracking branch 'upstream/master'
fix conflit of admin