stash 1
solve stash confilit
fix bug
dev complete
Merge branch 'dev'