Settings: fix merge

Change-Id: I2609b96494c306130089d0f1c72a2bf761ef801b