fix common.scss merge confilict