revert css that got messed up during a merge resolution