ridded conflicts and removed thermoconfigs