edited stylesheet
 conflicts resolved