I know I shouldn't do this, but it's late so I just gonna throw all my stuff into git, ignoring any atomicity
merge