From 46448bc5c7a060ef1e24ac25f0290945164b4e00 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Fri, 28 May 2021 10:46:41 +0200
Subject: [PATCH] :bug: Fix problem with merge and join nodes

---
 CHANGES.md                            | 5 +++++
 frontend/src/app/util/path/tools.cljs | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ac75ab009..cdfd2d3ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,11 @@
 ### :boom: Breaking changes
 ### :heart: Community contributions by (Thank you!)
 
+## 1.6.3-alpha
+
+### :bug: Bugs fixed
+
+- Fix problem with merge and join nodes [#990](https://github.com/penpot/penpot/issues/990)
 
 ## 1.6.2-alpha
 
diff --git a/frontend/src/app/util/path/tools.cljs b/frontend/src/app/util/path/tools.cljs
index 4f0110786..870ddab85 100644
--- a/frontend/src/app/util/path/tools.cljs
+++ b/frontend/src/app/util/path/tools.cljs
@@ -310,7 +310,7 @@
   [content points]
 
   (let [segments-set (into #{}
-                           (map (fn [[p1 p2 _]] [p1 p2]))
+                           (map (fn [{:keys [start end]}] [start end]))
                            (get-segments content points))
 
         create-line-command (fn [point other]
@@ -382,7 +382,7 @@
 
 (defn group-segments [segments]
   (loop [result []
-         [point-a point-b :as segment] (first segments)
+         {point-a :start point-b :end :as segment} (first segments)
          segments (rest segments)]
 
     (if (nil? segment)