fixed some css merge conflicts between branches