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