trying to create a conflict
Merge pull request #9 from Bonfire-Modules/test_checkout_branch

trying to create a conflict