remove merge conflict markers

Author: penelopeysm

HISTORY.md

@@ -19,8 +19,6 @@ The generic method `returned(::Model, values, keys)` is deprecated and will be r
 
 Added a compatibility entry for JET@0.11.
 
-> > > > > > > main
-
 ## 0.38.1
 
 Added `from_linked_vec_transform` and `from_vec_transform` methods for `ProductNamedTupleDistribution`.