local_settings changes
resolved a difficult conflict