simplify the merge flow
Merge branch 'master' of github.com:hupili/5carts