Fix merge conflict
Merge pull request #109 from gannetson/integration

Fix merge conflict