git branch testing
test conflicts
Merge branch 'testing'
conflict (testing)
conflict (master)
merge conflict