update password
solution merge conflict
Merge branch 'dev' of github.com:hellojian123/TradeMark into dev