merge ai fix