edit settings
starting merge stuff
fix some merge conflicts
settings alteration
settings final