commit commit-basic.txt
delete txt file
add commit-basic.txt
merge feature-branch-basic and master