should be fixed now {settings}
it says i have to do this to merge