[xwiki-notifications] [jira@xwiki.org][Issue] Updates for REPLICAT-228: Merge Conflict button "Mark as Resolved" is clickable without edit rights