Removed conflict in initial.js