merging css the cool way
fixing merge errs