file6
dev branch
log
merge
git stash
git stash apply
git comflict
issue fix
issue2 fix
git issue study
merge stash