put back patch conflict testing. fixes #106
Merge pull request #111 from CyberCRI/patch-confict-checking

Put back patch conflict testing. Fixes #106