another approach to solve conflicts
Authored by: thibautd 2013-12-04
Parent: [r27022]
Child: [r27024]