fixing settings
mergin