Merge settings with Posh-Hg because I'm tired of having dueling sets