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