Add conflict resolution support to QML bindings