Sync with sources

Why can Settings never merge properly? lol