fix merge conflicts in american_gut.py