Update settings.cpp

Resolving merge conflict