Merge finished
more merge fixes - keep xml files out