This is a test repo for practicing branck

scenario: create a merge conflict and resolve it

1. modify README.md online/github
2. modify README.md locally using git
3. upload modify locally