actually test other branch & fix its brokenness, dadoi