Fixed wrong merge of js/main.js