i2c fix
merged conflix