fixed type in stylesheet
fixed merge conflict