modify the sample file
Added another file to my branch
added some text to another file
added yet another file to a new branch
added more stuff to master branch
fixed a merge conflict