Looking at this PR, I see the same issues. I wonder if this commit

https://pagure.io/fork/pjp/fedora-budget/c/705b514c78eb595471f7715ad27b997e6bd8323d

is the issue.

Can you do a rebase?

Assuming you've mapped the upstream as a remote named upstream:

git checkout
git fetch upstream
git pull --rebase upstream/master
git push -f origin

This PR is coming from master, which is generally not the best place to originate a PR.

Happy to work with you in real-time on this.

This pull request was opened in April 2018 and was handled in a previous fiscal year, when @bex was FCAIC. So, I am going to close this PR since it changes 73+ different files from multiple different fiscal years, which I don't think was intended.