fix
merge and fix
merge AI