diff --git a/tests/test-conflict b/tests/test-conflict