Feature: squash fixes onto trunk branch then onto main

[sambacha]

There are alot of PR's pending, we should just use a branch named trunk, squash the commits onto that branch, then merge commit onto main.