merge tp2