This is a test repo for practicing branck scenario: create a merge conflict and resolve it modify README.md online/github modify README.md locally using git upload modify locally