fix conflict left when merge
Merge branch 'dev' of github.com:us4us/seed into dev