fixed settings file
fixed merges