Fix css to account for merge errors

they are really annoying