This is the personal part
This is the initial commit No Conflict
MERGE CONFLICT WITH REBASE With two simple lines (and) Another Change
This is the initial file no conflict
And it has two lines
non-conflicting change
commit as someone else
Note, I melded these two from bitbucket and github
Scooby Doo
test