fixing merge conflict with minified stylesheet