Add a message that explains what to do when a merge conflict is detected and needs to be dealt with.