Delete main.css.orig

delete conflicted file