Resolve pull merge conflict

ubee/__main__.py

@@ -121,11 +121,8 @@ def ifn(
         _ = None
 
     # return out_df, pd.DataFrame(res1_, columns=["text1", "text2", "likelihood"]), _
-<<<<<<< HEAD
+
     return pd.DataFrame(res1_, columns=["text1", "text2", "likelihood"]).to_html(), _.to_html()
-=======
-    return pd.DataFrame(res1_, columns=["text1", "text2", "likelihood"]), _
->>>>>>> 1b2837ac7145a0ce5ead7088aaa41165a6615ad4
 
 
 def main():
@@ -206,25 +203,12 @@ def main():
         )
         with gr.Column():
             with gr.Row():
-<<<<<<< HEAD
                 text1 = gr.inputs.Textbox(
                     lines=lines, placeholder=placeholder, default=ex1_zh, label="text1"
                 ),
                 text2 = gr.inputs.Textbox(
                     lines=lines, placeholder=placeholder, default=ex1_en, label="text2"
-=======
-                text1 = gr.Textbox(
-                    lines=lines,
-                    placeholder=placeholder,
-                    value=ex2_zh,
-                    label="text1"
-                )
-                text2 = gr.Textbox(
-                    lines=lines,
-                    placeholder=placeholder,
-                    value=ex2_en,
-                    label="text2"
->>>>>>> 1b2837ac7145a0ce5ead7088aaa41165a6615ad4
+
                 )
             with gr.Row():
                 thresh = gr.Slider(
@@ -235,14 +219,8 @@ def main():
                     label="threshold",
                 )
                 btn = gr.Button("Run")
-<<<<<<< HEAD
             _ = """
             out_df = gr.outputs.Dataframe(
-=======
-
-            _ = """
-            out_df = gr.Dataframe(
->>>>>>> 1b2837ac7145a0ce5ead7088aaa41165a6615ad4
                 headers=None,
                 max_rows=lines,  # 20
                 max_cols=None,
@@ -251,7 +229,6 @@ def main():
                 label="To be aligned",
             )
             # """
-<<<<<<< HEAD
             with gr.Row():
                 _ = """
                 aligned = gr.Dataframe(
@@ -273,31 +250,7 @@ def main():
                 # """
                 aligned = gr.HTML(value="output aligned", label="Aligned")
                 leftover = gr.HTML(value="output leftover", label="Leftover")
-=======
-
-            # with gr.Row():
-            aligned = gr.Dataframe(
-                headers=None,
-                max_rows=lines,  # 20
-                max_cols=None,
-                overflow_row_behaviour="paginate",
-                type="auto",
-                label="Aligned",
-            )
-
-            leftover = gr.Dataframe(
-                headers=None,
-                max_rows=lines,  # 20
-                max_cols=None,
-                overflow_row_behaviour="paginate",
-                type="auto",
-                label="Leftover",
-            )
-
-            logger.debug("text1: %s", text1)
-            logger.debug("text2: %s", text2)
 
->>>>>>> 1b2837ac7145a0ce5ead7088aaa41165a6615ad4
             btn.click(
                 fn=ifn,
                 inputs=[