diff --git a/place.py b/place.py
index 85dec17..e247efe 100644
--- a/place.py
+++ b/place.py
@@ -449,6 +449,117 @@ def draw_star(size, x, y):
 penup()
 
 
+<<<<<<< HEAD
+# Ubuntu by Alen
+forward(500)
+pendown()
+setup(640,640)
+bgcolor('black')
+col = '#DD4814'
+R = 75
+r = 38.91*R/100
+w = 19.25*R/100
+r2 = 13.39*R/100
+r3 = 5.02*R/100
+h = 3.77*R/100
+l = 68.62*R/100
+color(col)
+up()
+fd(R)
+lt(90)
+down()
+begin_fill()
+circle(R)
+end_fill()
+up()
+color('white')
+lt(90)
+fd(R-(r+w))
+rt(90)
+down()
+begin_fill()
+circle(r+w)
+end_fill()
+up()
+lt(90)
+color(col)
+fd(w)
+rt(90)
+down()
+begin_fill()
+circle(r)
+end_fill()
+up()
+lt(90)
+fd(r)
+rt(120)
+down()
+color('white')
+for i in range(3):
+    up()
+    fd(l+r2+r3)
+    lt(90)
+    down()
+    color(col)
+    begin_fill()
+    circle(r2+r3)
+    end_fill()
+    up()
+    lt(90)
+    fd(r3)
+    rt(90)
+    color('white')
+    down()
+    begin_fill()
+    circle(r2)
+    end_fill()
+    up()
+    color('white')
+    lt(90)
+    fd(l+r2)
+    rt(90)
+    down()
+    color(col)
+    begin_fill()
+    fd(h)
+    lt(90)
+    fd(r+w)
+    lt(90)
+    fd(h*2)
+    lt(90)
+    fd(r+w)
+    lt(90)
+    fd(h)
+    end_fill()
+    up()
+    lt(30)
+
+# Draw heart
+pen = Turtle()
+def curve():
+    for i in range(200):
+        pen.right(1)
+        pen.forward(1)
+def heart():
+    pen.left(140)
+    pen.forward(113)
+    curve()
+    pen.left(120)
+    curve()
+    pen.forward(112)
+def txt():
+    pen.up()
+    pen.setpos(-200, 195)
+    pen.down()
+
+    pen.color('lightgreen')
+    pen.write("FOSSMEET'23", font=(
+      "Verdana", 12, "bold"))
+heart()
+txt()
+pen.ht()
+pen.end_fill()
+=======
 
 #turtle.Screen().bgcolor("black")
 #turtle.speed(0)
@@ -574,3 +685,4 @@ def ring(col, rad):
 r.forward(90.8)
 
 
+>>>>>>> 1b178933f8ccd68a17e6e116973d74075d297991