commit gitskills
dev merge master
fixed bug 101
fixed bug 101
commit stash 2 modify
stash test commit
fixed conflict
append temp.txt on master branch