main.js conflict resolved