Merge conflict issue in custom.css, fixed