Checking 96.xsl
merge conflict fixed