Updated c-8 blog conflicts