Practice commit
Branch commit
Master commmit
Merge branch 'newBranch'
branch conflict