fix some styles overwritten by merging