WIP to test one more change to the test

Pushing to allow TravisCI to check this change.
Reverting the conflict integration test. I will either revert this if it
does not work or merge it into one of the previous commits if it does.