change command flow
Merge branch 'develop'