chore: Added sourcemaps to CSS
chore: Fixed merge conflict