css & xsl & modifs xsd
fix conflicts