Fix bad merge of Error_Settings__c