Fix merge conflicts for dconf settings