ai.js Merge Error Fixed