Most a new issue to originating repo when merge conflict is detected

This should at least help mitigate merge conflicts, instead of silently failing. Will deploy and test it out. 

/cc @jakeboxer @kdaigle