diff --git a/src/models/mlp.py b/src/models/mlp.py
index bd3e1a4e..1543153d 100644
--- a/src/models/mlp.py
+++ b/src/models/mlp.py
@@ -261,8 +261,7 @@ def __init__(self, input_dim, output_dim, hidden_dim = 64):
     def forward(self, x):
         out = self.layer(x)
         return out
-<<<<<<< HEAD
-=======
+
 
 # For avazu and criteo dataset
 class MLP3_256_dense(nn.Module):
@@ -301,4 +300,4 @@ def forward(self, x):
         # x = x.view(x.size(0), -1)
         out = self.layer(x)
         return out
->>>>>>> 0a51fa38d26db375eda0cbe397a696d8251fe00d
+