Fixed conflict in main.js