testing alias
commit
fixed issue 54
hotifx
more fixes
Merge branch 'issue54'
updates to nothing
updates to something
merged code
another conflict
another update
merged
merged
added file
removed
testing
Merge branch 'testConflict'
conflicts