removed xmla from shrinkwrap, updated less
resolved conflicts
resolved conflicts