remove conflicts in ccc