fixed merge conflict error message

* changed merge conflict error message to say instead of raise and
added exit