sync github , merchant reset password etc.
fix confilicts when merge