Fix conflicts in the permissions MR