modify triagle.py

delete conflict lines