Index: tests/support.c
===================================================================
--- tests/support.c	(revision 6001)
+++ tests/support.c	(working copy)
@@ -524,6 +524,24 @@
 	}
 }
 
+
+void conflict_handler_choose_member(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data)
+{
+	OSyncChange *change = NULL;
+	OSyncError *error = NULL;
+
+	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, engine, mapping, user_data);
+	
+	num_mapping_conflicts++;
+	fail_unless(num_engine_end_conflicts == 0, NULL);
+
+	change = osync_mapping_engine_member_change(mapping, GPOINTER_TO_UINT(user_data));
+	osync_assert(osync_engine_mapping_solve(engine, mapping, change, &error));
+	osync_assert(error == NULL);
+	
+	osync_trace(TRACE_EXIT, "%s", __func__);
+}
+
 void conflict_handler_choose_first(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data)
 {
 	OSyncChange *change = NULL;
Index: tests/support.h
===================================================================
--- tests/support.h	(revision 6001)
+++ tests/support.h	(working copy)
@@ -123,6 +123,7 @@
 void mapping_status(OSyncEngineMappingUpdate *status, void *user_data);
 
 /* Conflict handlers */
+void conflict_handler_choose_member(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
 void conflict_handler_choose_first(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
 void conflict_handler_choose_deleted(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
 void conflict_handler_choose_modified(OSyncEngine *engine, OSyncMappingEngine *mapping, void *user_data);
Index: tests/sync-tests/check_multisync.c
===================================================================
--- tests/sync-tests/check_multisync.c	(revision 6001)
+++ tests/sync-tests/check_multisync.c	(working copy)
@@ -1045,7 +1045,7 @@
 	char *testbed = setup_testbed("multisync_conflict_changetype_choose");
 	OSyncError *error = NULL;
 	OSyncEngine *engine = setup_engine(testbed);
-	osync_engine_set_conflict_callback(engine, conflict_handler_choose_modified, GINT_TO_POINTER(3));
+	osync_engine_set_conflict_callback(engine, conflict_handler_choose_member, GINT_TO_POINTER(2));
 
 	fail_unless(osync_engine_initialize(engine, &error), NULL);
 	fail_unless(error == NULL, NULL);