Removed merge conflict message from main.js