Unstaged changes (43)
Automatic merge failed; fix conflicts and then commit the result.
🥹🔫
Hire more devs they said. It will be jolly and well they said.
Less than 2 weeks of work and the main branch I am trying to merge back into is unrecognizable.
Damn those hard-working people
