FIX fixed merge problem in main.js