Only idiots make 2 completely different massive changes to their app on a single long running branch and then have to revert one of them (it’s me im idiots)