on branch add file 19/19.txt
 hotfix
 edit walk.py
 edit walk.py on master branc
 fix merge problem
 del a line
 del a line content on master
 mergetool test