Trying to merge caused a bunch of problems, so I had to reset and now
I'm committing a bunch of stuff again