Merged EdgeShape.cs