change stylesheet for pull
corrected merge conflicts