Fixed merging conflicts in child_compassion.py