Fix CNC merge conflicts