Working on ai
merge
merge2