Changes turbux and tslime configs
Fix merge conflicts