temporarily disable conflict-resolution test (need to complete soon)