adding git test files
making changes
commiting conflicts
Merge branch 'bugfix1'