test-repo

This is a test repo And now we're going to create a conflict because the upstream file has been changed. Working with "detached HEAD" and did a commit. new branch was new now, making update to master