Text Added
Draw Edges + conflict resolution