[xwiki-notifications] [[email protected]][Issue] Updates for REPLICAT-228: Merge Conflict button "Mark as Resolved" is clickable without edit rights