css files updated in project folder
css updated in project folder
conflicts resolved after merge