chore(gulpfile): Add sourcemaps to JS
chore: Fixed merge conflicts