test merge conflict
Merge branch 'master' of https://github.com/JuulArthur/ai2
Fix merge conflict and add section