Fix merge conflict

Author: cogliano

PyPortal_EZ_Make_Oven/code.py

@@ -108,7 +108,7 @@ def __init__(self, pin):
         with open("/profiles/" + self.config["profile"] + ".json", mode="r") as fpr:
             self.sprofile = json.load(fpr)
             fpr.close()
-        i2c = busio.I2C(board.SCL, board.SDA, frequency=100000)
+        i2c = busio.I2C(board.SCL, board. SDA, frequency=200000)
         try:
             self.sensor = MCP9600(i2c, self.config["sensor_address"], "K")
             self.ontemp = self.sensor.temperature