added message to be displayed if there is a merge conflict