Yea we run into the paradox of trying to be cautious about putting things in main right away, but then fixes and scope creep for parallel feature branches get conflicted, so then test ends up becoming a massive diff.