trying to merge 1
Merge branch 'george'

trying to merge 1 - result