[TP1] - Merge