mostly filters stuff
fixed conflicts
merge conflicts
settings page