diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 56b0b288ad6..9d7005254e2 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -1592,13 +1592,10 @@ libs:
   - src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
   - src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
   - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
-<<<<<<< HEAD
-  - src/core/ext/filters/client_channel/lb_policy/xds/xds.cc
   - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
-=======
   - src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
   - src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
->>>>>>> upstream/master
+  - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
   - src/core/ext/filters/client_channel/lb_policy_registry.cc
   - src/core/ext/filters/client_channel/local_subchannel_pool.cc
   - src/core/ext/filters/client_channel/parse_address.cc