testing
Merge pull request #66 from segmentio/test/automerge

testing automerge