- 3in1: Update Upstream, Remove useless patches, Fix cramming/colliding