fleshed out merge step