Add CurvedArrowView definition
Resolve conflict