Commit to a branch with a conflict.
Merge pull request #6 from pyrosphere3/test

Commit to a branch with a conflict.