amend using and append a file
fix a bug
iss53
finish a task
Merge branch 'iss53'
merge iss53 to master
test conflict in master
test conflict in iss53
conflict testing
rebase in master
rebase test