fixed conflicts in carbon_count.py