resolved conflict
added provenance
removed require and run lines