CC fixes
Fix merge conflicts