merge conflict in min.css