Added a proper message.

Cannot merge
This branch has merge conflicts in the following files:
  • README.md

Sign up or log in to comment