I think what happened was you split a path by inserting a crossing (totally normal, nothing bad here), and when I resolved the conflicts I deleted the "new" path segment you added, as my changes were still based on the older, longer path.