Fix https://github.com/groupon/DotCi/issues/34

Detecting merge conflict per
* https://developer.github.com/v3/repos/merging
* https://github.com/blog/843-the-merge-button
(cherry picked from commit 4ba2e65a3806b1d804912d8fa497f167d290826d)