mordor sim params
merge
mordor update testing
NEW: merge connection files