Removed main.js
a
conflict solved