diff --git a/main.py b/main.py
index ad6c6a0aa6830e0c1c8e4e47e269169adc423f5b..8141457b2e919129d812ffd41d93a05c47e4862e 100644
--- a/main.py
+++ b/main.py
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 from pyomo.environ import *
 from pyomo.opt import SolverFactory
 
@@ -19,3 +20,10 @@ result = SolverFactory("glpk").solve(model)
 model.pprint()
 
 model.display()
+=======
+l = ['a', 'x', 'b', 'x', 'c', 'x']
+print(l)
+l.pop(2) # remove the first item with value 'x'
+print(l)
+
+>>>>>>> origin/main