updated stylesheets
resolved merge conflicts in stylesheet