fix merge conflict in apps.src.settings to fix build. Tested that it compiles, other tests belong to previous commit.