Massive merge via resets, horrible horrible horrible git practice