Seperate the settings into another branch.