resolve merge conflict in site.css