clean code

.idea/workspace.xml

@@ -5,9 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="23565123-73ab-4f40-a9ef-1086e0c9e1ec" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/moe_model.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/script.py" beforeDir="false" afterPath="$PROJECT_DIR$/script.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/lcnn_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/lcnn_model.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -134,7 +131,7 @@
       <workItem from="1742889011586" duration="41000" />
       <workItem from="1742890414523" duration="4382000" />
       <workItem from="1742941362366" duration="1283000" />
-      <workItem from="1742970904084" duration="1559000" />
+      <workItem from="1742970904084" duration="1716000" />
     </task>
     <servers />
   </component>

src/lcnn_model.py

@@ -24,12 +24,8 @@ class LCNN(nn.Module):
     def __init__(self, return_emb=False, num_class=2):
         super(LCNN, self).__init__()
 
-<<<<<<< HEAD
-        self.threshold = 0.7
-        self.return_emb = return_emb
-=======
         self.threshold = 0.5
->>>>>>> 8ce022751ede24f85b3e26af79e0745f8462b868
+        self.return_emb = return_emb
 
         # Feature Extraction Part (First Part)
         self.dropout1 = nn.Dropout(0.2)