commit merge conflict maker
exploreing conflicts
Merge pull request #2 from nikolaswise/master

pr