merge error fixed in settings.cs