diff --git a/tests/test_rest_put_object.sh b/tests/test_rest_put_object.sh
index ce3a683..95361d7 100755
--- a/tests/test_rest_put_object.sh
+++ b/tests/test_rest_put_object.sh
@@ -500,9 +500,13 @@ export RUN_USERS=true
   assert_success
   bucket_name="$output"
 
+<<<<<<< HEAD
   run get_file_name
   assert_success
   test_file=$output
+=======
+  test_file="test_file_$(uuidgen)"
+>>>>>>> ed2de68 (test: PutObject object lock tests and updates, delete bucket test)
 
   run setup_bucket_object_lock_enabled_v2 "$bucket_name"
   assert_success