We had a merge conflict in the last 10 minutes. We tried our best to fix it in time but we just ended up trying our hardest to quickly add everything lost which, as you can probably tell didn't go too well, we'll release a fixed version someimt in the future