merge: simplify code flow