cleaned up quartus project by place i2c core in ip folder
fixing merge conflicts