Server prefs yo
Fix merge conflict