Resolve more merge conflicts with repeated config vars