This should conflict
Merge branch 'master' of github.com:sca4/my-api-testing
Blargh
Merge pull request #334 from sca4/testing3

Testing3