reaolved more conflicts. Triangles unfornutately have unusualy behaviour