I think the plan now (per the transparency post) is to drop merge plans per se, implement the features in Hexbear that Lemmy is still missing, and migrate Hexbear's data to mainline Lemmy once it's possible.