Update base for Update on "Remove usages of 'to_edge_with_preserve_ops'"

Replace with to_edge.

Differential Revision: [D78311705](https://our.internmc.facebook.com/intern/diff/D78311705/)

[ghstack-poisoned]

Author: lucylq

exir/program/test/test_program.py

@@ -784,11 +784,7 @@ def _test_to_edge_with_preserved_ops(
         self, program, preserved_ops, expected_preserved_ops
     ):
         edge = to_edge(
-<<<<<<< HEAD
             program, compile_config=EdgeCompileConfig(preserve_ops=preserved_ops)
-=======
-            program, compile_config=EdgeCompileConfig(_preserve_ops=preserved_ops)
->>>>>>> 0012ffaf9f (Add preserve_ops to EdgeCompileConfig (#12546))
         )
 
         def count_nodes(graph_module, target):