work on concurrently. fixes to MergeTest