fixed up some styles that didn't merge properly