Fixed I2C Slave problems caused by merge