No more stale + fixing merge conflict (#8240)

.github/gbp.toml

@@ -6,11 +6,7 @@ reset_label = "GBP: Reset"
 "Atomic" = 2
 "Balance/Rebalance" = -4
 "Code Improvement" = 2
-<<<<<<< HEAD
 "Mechanic" = -4
-=======
-"Content Expansion" = -3
->>>>>>> fd57a3b5067 (add Administration tag to gbp list, 2 points (#61460))
 "Feedback" = 2
 "Fix" = 4
 "Grammar and Formatting" = 1
@@ -20,12 +16,8 @@ reset_label = "GBP: Reset"
 "Performance" = 12
 "Priority: CRITICAL" = 20
 "Priority: High" = 15
-<<<<<<< HEAD
 "Quality of Life" = 2
 "Content Expansion" = -3
-=======
-"Quality of Life" = 1
->>>>>>> fd57a3b5067 (add Administration tag to gbp list, 2 points (#61460))
 "Refactor" = 10
 "Sound" = 3
 "Sprites" = 3

.github/workflows/stale.yml

@@ -14,8 +14,8 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 3 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself"
-        days-before-stale: 4
-        days-before-close: 3
+        days-before-stale: -1
+        days-before-close: -1
         days-before-issue-stale: -1
         days-before-issue-close: -1
         stale-pr-label: 'Stale'