changed name of style sheets
renamed files
merge conflict fixed