Fixed merge conflict in calliope.sh