Update Reset to Upstream and Merge PRs.yml

Author: soultaco83

.github/workflows/Reset to Upstream and Merge PRs.yml

@@ -36,11 +36,7 @@ env:
   # Default PR numbers to use for both scheduled and manual runs (if not specified)
   # This list is automatically updated - merged PRs are removed after successful runs
   # To add new PRs: edit this line and add the PR numbers to the list
-<<<<<<< HEAD
   DEFAULT_PR_NUMBERS: '5011,6735,7058,7090,7100,7307,7355,7391,7410,7414,7419,7431,7445,7446,7453,7455,7461,7463,7469,7470,7471,7477,7478,7480,7487'
-=======
-  DEFAULT_PR_NUMBERS: '5011,6735,7058,7090,7100,7223,7307,7355,7391,7410,7414,7419,7431,7445,7446,7453,7455,7461,7463,7469,7471,7477,7478,7480,7487,7501'
->>>>>>> ff68f8b5010155e4f0080f7fb6c21d938ab6a194
   #
   # Token for authentication
   GH_TOKEN: ${{ secrets.PAT_TOKEN || github.token }}