fix merge errors
opretLogin validators
Merge branch 'origin/master'