add conflict.txt
add conflict.txt on master
fixed conflict
add log with 'git stash'