refactor(mix): simplify deferred merge and stabilize variant ordering#862

leoafarias wants to merge 4 commits into

mainconceptadev/mix:mainfrom

refactor/simplify-defer-merge-and-testconceptadev/mix:refactor/simplify-defer-merge-and-testCopy head branch name to clipboard