@williamshields we aren't even using branching; we've had a lot of accidental branches and merge fails even for "simple" things.