allow to choose between the two implemented conflict resolution strategies from config
Authored by: thibautd 2013-12-04
Parent: [r27024]
Child: [r27026]