diff --git a/build/lib/gradio/inputs.py b/build/lib/gradio/inputs.py
index 2c954fc78f..8d6379bbcd 100644
--- a/build/lib/gradio/inputs.py
+++ b/build/lib/gradio/inputs.py
@@ -308,18 +308,11 @@ class Image(AbstractInput):
         return array
 
     def process_example(self, example):
-<<<<<<< HEAD
-        if os.path.exists(example)
-            return preprocessing_utils.convert_file_to_base64(example)
-        else:
-            return example
-=======
         if os.path.exists(example):
             return preprocessing_utils.convert_file_to_base64(example)
         else:
             return example
 
->>>>>>> 2e5378d7f8fce70786c93d727f5a5c008c74bff9
 
 class Microphone(AbstractInput):