pushOrMerge is evolving; good point to simplify