updated settings
conflict