updated the conflicts for the sfdc outage feature