Fix merge conflict in style.min.css