Streams module moved to xml_tool
Conflict resolution