conclude merge and migrate to new fase2 style