remove merge conlfict from built style.css in dist