Resolve conflicts with buffer abstraction#11

ocdbytes merged 35 commits into

ocdbytes:aj/zk-whir-3-3ocdbytes/whir:aj/zk-whir-3-3from

worldfnd:zkfr/zk-whir-3-3-buffer-abstractionworldfnd/whir:zkfr/zk-whir-3-3-buffer-abstractionCopy head branch name to clipboard