[VP, TP] resolved conflicts