make a change
made other changes
conflict
commit
Merge branch 'testing'

Merging with testing branch
testing.rb