--- MANIFEST.old	2026-07-25 15:07:28
+++ MANIFEST	2026-08-03 23:20:24
@@ -55,13 +55,9 @@
 t/27app_fatpacker.t
 t/28appledouble.t
 t/29unreadable.t
-<<<<<<< HEAD
 t/30search_dirs_strict.t
 t/31per_path_opts.t
-=======
-t/30per_path_opts.t
-t/31sort_results.t
->>>>>>> 14fe60b (Add opt-in sort_results option.)
+t/32sort_results.t
 t/acme/Acme/MyTest/Plugin/Foo.pm
 t/fp/app.pl
 t/fp/lib/App/TestMPFP/Plugin/A.pm
@@ -97,4 +93,3 @@
 t/lib/TriggerTest/Plugin/Deny.pm
 t/lib/TriggerTest/Plugin/Error.pm
 t/lib/Zot/.Zork.pm
-t/search_dirs_strict.t