Working on conflict-resolution test for cluster (half-done)