TC and CC
Conflict resolved