Initial commit
HELLO
I am committed
Merge branch 'master' of https://github.com/pcgs/repo1

 Please enter a commit message to explain why this merge is necessary,
newfile committed
fixed conflicts