Adjusted stylesheet
Managed conflicts