fix integration test patch conflict
Merge pull request #447 from jpoimboe/integration-test-fix

fix integration test patch conflict