Removed some duplicate styles from the merge that were causing issues.