Fixed conflicts in the global stylesheet