trian update
conflcit solved