Revert issues on main branch
Myself and 2 other developers have been working on code on our develop2 branch for a few months. We have had many commits, pull requests and merges into this branch.
Periodically, we have done a merge from develop 2 into our main develop branch, this is the branch before master.