Fixed re-introduced Settings entries due to merge going haywire