test and bugfix in current conflict solving
it was actually removing the biggest joint plan!
Authored by: thibautd 2013-12-04
Parent: [r27021]
Child: [r27023]