diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 4362a878e..ad2a25076 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -36,7 +36,10 @@ struct sway_cursor {
 	struct wl_listener axis;
 	struct wl_listener frame;
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> Register touch events in libtouch engine
 	struct libtouch_engine *gesture_engine;
 	struct wl_listener touch_down;
 	struct wl_listener touch_up;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 6d5c315f5..2b2f4000e 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -362,10 +362,16 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
 		cursor_set_image(cursor, NULL, NULL);
 	}
 
+<<<<<<< HEAD
 	libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
 				       LIBTOUCH_TOUCH_DOWN, event->x, event->y);
 
 		
+=======
+	libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec,
+				       event->touch_id, LIBTOUCH_TOUCH_DOWN,
+				       event->x, event->y);
+>>>>>>> Register touch events in libtouch engine
 }
 
 static void handle_touch_up(struct wl_listener *listener, void *data) {
@@ -376,8 +382,14 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
 	struct wlr_seat *seat = cursor->seat->wlr_seat;
 	// TODO: fall back to cursor simulation if client has not bound to touch
 	wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id);
+<<<<<<< HEAD
 	libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
 				       LIBTOUCH_TOUCH_UP, 0,0);
+=======
+
+	libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec,
+				       event->touch_id, LIBTOUCH_TOUCH_UP, 0, 0);
+>>>>>>> Register touch events in libtouch engine
 }
 
 static void handle_touch_motion(struct wl_listener *listener, void *data) {
@@ -418,8 +430,13 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
 			event->touch_id, sx, sy);
 	}
 
+<<<<<<< HEAD
 	libtouch_engine_register_move(engine, event->time_msec, event->touch_id,
 			       event->x, event->y);
+=======
+	libtouch_engine_register_move(cursor->gesture_engine, event->time_msec,
+				      event->touch_id, event->x, event->y);
+>>>>>>> Register touch events in libtouch engine
 }
 
 static double apply_mapping_from_coord(double low, double high, double value) {