NPE in conflict manager

[skyper]

I tried to reproduce #4663

What steps will reproduce the problem?

1. load file from #4663
2. update data ends up with 150 conflicts
3. solve conflict on ID: 62.897
4. did undo
5. tried to solve conflict again and fiddelt around when strange member appeared.
6. added one member and got exception

Please provide any additional information below. Attach a screenshot if
possible.

Repository Root: http://josm.openstreetmap.de/svn
Build-Date: 2011-05-05 01:31:35
Last Changed Author: jttt
Revision: 4073
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
URL: http://josm.openstreetmap.de/svn/trunk
Last Changed Date: 2011-05-04 22:03:53 +0200 (Wed, 04 May 2011)
Last Changed Rev: 4073

Identification: JOSM/1.5 (4073 en)
Memory Usage: 65 MB / 248 MB (21 MB allocated, but free)
Java version: 1.6.0_18, Sun Microsystems Inc., OpenJDK Client VM
Operating system: Linux

Dataset consistency test:
[DELETED REFERENCED] {Way id=4810616 version=2 D nodes=[{Node id=30890558 version=3 D lat=47.8677965,lon=8.0756275}, {Node id=30890591 version=1 V lat=47.8678064,lon=8.0748723}, {Node id=30890592 version=1 V lat=47.8686238,lon=8.0733492}, {Node id=30890593 version=2 V lat=47.8696562,lon=8.0727521}, {Node id=30890594 version=1 V lat=47.8705651,lon=8.0725115}, {Node id=30890595 version=3 V lat=47.8709509,lon=8.0725082}, {Node id=30890596 version=2 D lat=47.8715358,lon=8.0717499}]} refers to deleted primitive {Node id=30890558 version=3 D lat=47.8677965,lon=8.0756275}
[DELETED REFERENCED] {Way id=4810616 version=2 D nodes=[{Node id=30890558 version=3 D lat=47.8677965,lon=8.0756275}, {Node id=30890591 version=1 V lat=47.8678064,lon=8.0748723}, {Node id=30890592 version=1 V lat=47.8686238,lon=8.0733492}, {Node id=30890593 version=2 V lat=47.8696562,lon=8.0727521}, {Node id=30890594 version=1 V lat=47.8705651,lon=8.0725115}, {Node id=30890595 version=3 V lat=47.8709509,lon=8.0725082}, {Node id=30890596 version=2 D lat=47.8715358,lon=8.0717499}]} refers to deleted primitive {Node id=30890596 version=2 D lat=47.8715358,lon=8.0717499}
[DELETED REFERENCED] {Way id=31065584 version=2 D nodes=[{Node id=299797294 version=2 V lat=47.8560935,lon=8.0853855}, {Node id=299797016 version=2 D lat=47.855888,lon=8.0856055}, {Node id=299797017 version=2 D lat=47.8558189,lon=8.0859317}, {Node id=299797293 version=2 V lat=47.8557177,lon=8.0865617}]} refers to deleted primitive {Node id=299797016 version=2 D lat=47.855888,lon=8.0856055}
[DELETED REFERENCED] {Way id=31065584 version=2 D nodes=[{Node id=299797294 version=2 V lat=47.8560935,lon=8.0853855}, {Node id=299797016 version=2 D lat=47.855888,lon=8.0856055}, {Node id=299797017 version=2 D lat=47.8558189,lon=8.0859317}, {Node id=299797293 version=2 V lat=47.8557177,lon=8.0865617}]} refers to deleted primitive {Node id=299797017 version=2 D lat=47.8558189,lon=8.0859317}
[DELETED REFERENCED] {Way id=28746377 version=4 D nodes=[{Node id=28795224 version=3 V lat=47.8547494,lon=8.0740907}, {Node id=28795223 version=3 D lat=47.8544535,lon=8.0746846}, {Node id=28795222 version=3 D lat=47.8541718,lon=8.0748037}, {Node id=28795221 version=3 D lat=47.8539769,lon=8.0747496}, {Node id=28795220 version=3 D lat=47.8521572,lon=8.0762227}, {Node id=28795219 version=2 V lat=47.8519622,lon=8.0762443}, {Node id=28795217 version=2 V lat=47.8513881,lon=8.0754428}, {Node id=28795216 version=2 V lat=47.8512148,lon=8.0743596}, {Node id=28795215 version=2 V lat=47.8508899,lon=8.073948}, {Node id=28795214 version=2 V lat=47.8507057,lon=8.0734606}, {Node id=28795213 version=2 V lat=47.8502292,lon=8.0731248}, {Node id=28795210 version=2 V lat=47.8499909,lon=8.073374}, {Node id=28795209 version=2 V lat=47.8493085,lon=8.0740347}, {Node id=28795208 version=2 V lat=47.8489727,lon=8.0745979}, {Node id=28795206 version=2 V lat=47.8483986,lon=8.0745763}, {Node id=28795205 version=2 V lat=47.8480737,lon=8.0743271}, {Node id=28795203 version=2 V lat=47.8473696,lon=8.0742188}, {Node id=28795202 version=2 V lat=47.8471746,lon=8.0743705}, {Node id=28795201 version=2 V lat=47.846958,lon=8.0744246}, {Node id=28795200 version=2 V lat=47.8465031,lon=8.0749229}, {Node id=28795199 version=2 V lat=47.8466764,lon=8.0756919}, {Node id=28795196 version=2 V lat=47.8466439,lon=8.0759735}, {Node id=28795193 version=2 V lat=47.8467739,lon=8.0770242}, {Node id=28795191 version=2 V lat=47.8465572,lon=8.0784865}, {Node id=28795189 version=2 V lat=47.846254,lon=8.0795804}, {Node id=28795187 version=10 V lat=47.8458958,lon=8.0802674}]} refers to deleted primitive {Node id=28795223 version=3 D lat=47.8544535,lon=8.0746846}
[DELETED REFERENCED] {Way id=28746377 version=4 D nodes=[{Node id=28795224 version=3 V lat=47.8547494,lon=8.0740907}, {Node id=28795223 version=3 D lat=47.8544535,lon=8.0746846}, {Node id=28795222 version=3 D lat=47.8541718,lon=8.0748037}, {Node id=28795221 version=3 D lat=47.8539769,lon=8.0747496}, {Node id=28795220 version=3 D lat=47.8521572,lon=8.0762227}, {Node id=28795219 version=2 V lat=47.8519622,lon=8.0762443}, {Node id=28795217 version=2 V lat=47.8513881,lon=8.0754428}, {Node id=28795216 version=2 V lat=47.8512148,lon=8.0743596}, {Node id=28795215 version=2 V lat=47.8508899,lon=8.073948}, {Node id=28795214 version=2 V lat=47.8507057,lon=8.0734606}, {Node id=28795213 version=2 V lat=47.8502292,lon=8.0731248}, {Node id=28795210 version=2 V lat=47.8499909,lon=8.073374}, {Node id=28795209 version=2 V lat=47.8493085,lon=8.0740347}, {Node id=28795208 version=2 V lat=47.8489727,lon=8.0745979}, {Node id=28795206 version=2 V lat=47.8483986,lon=8.0745763}, {Node id=28795205 version=2 V lat=47.8480737,lon=8.0743271}, {Node id=28795203 version=2 V lat=47.8473696,lon=8.0742188}, {Node id=28795202 version=2 V lat=47.8471746,lon=8.0743705}, {Node id=28795201 version=2 V lat=47.846958,lon=8.0744246}, {Node id=28795200 version=2 V lat=47.8465031,lon=8.0749229}, {Node id=28795199 version=2 V lat=47.8466764,lon=8.0756919}, {Node id=28795196 version=2 V lat=47.8466439,lon=8.0759735}, {Node id=28795193 version=2 V lat=47.8467739,lon=8.0770242}, {Node id=28795191 version=2 V lat=47.8465572,lon=8.0784865}, {Node id=28795189 version=2 V lat=47.846254,lon=8.0795804}, {Node id=28795187 version=10 V lat=47.8458958,lon=8.0802674}]} refers to deleted primitive {Node id=28795222 version=3 D lat=47.8541718,lon=8.0748037}
...<snip>.

[skyper]

screenshot