login -view  change function check
Merge remote-tracking branch 'origin/master'