fix conflict

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml

@@ -165,7 +165,6 @@ jobs:
 
         source build.env
         eatmydata -- go run test.go -skip-build -keep-data=false -docker=false -print-log -follow -tag upgrade_downgrade_query_serving_queries
->>>>>>> parent of 25a80acbfd ([release-19.0] Improve the queries upgrade/downgrade CI workflow by using same test code version as binary (#16494) (#16501))
 
     # Swap the binaries in the bin. Use vtgate version n+1 and keep vttablet at version n
     - name: Use next release's VTGate