Fix pull requests to detect merge coflicts
Detect merge conflicts and don't allow sending in pull requests