Updating css/jss files
resolving conflicts