settings: fix up merges