fix conflict
Merge pull request #102 from AI-comp/fix_conflict

fix conflict