fix issue in issue branch
Merge branch 'issue1'
test stash in dev branch
fix conflict
remote pull test