Merge conflicts

desktop_env/evaluators/metrics/__init__.py

@@ -18,7 +18,8 @@ from .chrome import (
     is_expected_search_query,
     is_expected_active_tab,
     is_expected_url_pattern_match,
-    is_added_to_steam_cart
+    is_added_to_steam_cart,
+    compare_pdf_images
 )
 from .docs import (
     compare_font_names,
@@ -45,7 +46,8 @@ from .docs import (
     is_first_line_centered,
     check_file_exists,
     check_tabstops,
-    compare_contains_image
+    compare_contains_image,
+    compare_docx_images
 )
 from .general import (
     check_csv,
@@ -58,7 +60,8 @@ from .general import (
     fuzzy_match,
     check_include_exclude,
     check_direct_json_object,
-    diff_text_file
+    diff_text_file,
+    literal_match
 )
 from .gimp import (
     check_brightness_decrease_and_structure_sim,
@@ -129,7 +132,8 @@ from .vscode import (
     check_json_keybindings,
     check_python_file_by_test_suite,
     check_python_file_by_gold_file,
-    check_html_background_image
+    check_html_background_image,
+    compare_zip_files
 )