minor problems
merge conflicts in ai