diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 48e55317..00e6f1b5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -161,14 +161,11 @@ import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-<<<<<<< HEAD:src/main/java/org/asamk/signal/manager/Manager.java
 import static org.asamk.signal.manager.ServiceConfig.CDS_MRENCLAVE;
 import static org.asamk.signal.manager.ServiceConfig.capabilities;
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import static org.asamk.signal.manager.ServiceConfig.getIasKeyStore;
-=======
 import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
->>>>>>> upstream/master:lib/src/main/java/org/asamk/signal/manager/Manager.java
 
 public class Manager implements Closeable {
 
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 2654b653..4a8c70f4 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -11,11 +11,8 @@ public class Commands {
         addCommand("addDevice", new AddDeviceCommand());
         addCommand("block", new BlockCommand());
         addCommand("daemon", new DaemonCommand());
-<<<<<<< HEAD
         addCommand("stdio", new StdioCommand());
-=======
         addCommand("getUserStatus", new GetUserStatusCommand());
->>>>>>> upstream/master
         addCommand("link", new LinkCommand());
         addCommand("listContacts", new ListContactsCommand());
         addCommand("listDevices", new ListDevicesCommand());
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 20ddb6eb..24df5d89 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -129,15 +129,9 @@ public class SendCommand implements DbusCommand {
         }
 
         try {
-<<<<<<< HEAD
             System.out.println(Arrays.toString(ns.getList("recipient").toArray()));
-            long timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient"));
-            System.out.println(timestamp);
-            return 0;
-=======
             var timestamp = signal.sendMessage(messageText, attachments, recipients);
             writer.println("{}", timestamp);
->>>>>>> upstream/master
         } catch (AssertionError e) {
             handleAssertionError(e);
             throw e;
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index a089ae96..c7f7b4cd 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -125,19 +125,18 @@ class JsonDataMessage {
         } else {
             this.attachments = List.of();
         }
-<<<<<<< HEAD
-        if (dataMessage.getReaction().isPresent()) {
+	/*if (dataMessage.getReaction().isPresent()) { // not sure if json reactions have been implemented elsewhere
             final SignalServiceDataMessage.Reaction reaction = dataMessage.getReaction().get();
             this.reaction = new JsonReaction(reaction);
-/*          this.emoji = reaction.getEmoji();
+            this.emoji = reaction.getEmoji();
             this.targetAuthor = reaction.getTargetAuthor().getLegacyIdentifier();
-			this.targetTimestamp = reaction.getTargetSentTimestamp();
-*/        } /*else {
-			this.reaction = null;
+            this.targetTimestamp = reaction.getTargetSentTimestamp();
+        } else {
+            this.reaction = null;
             this.emoji = "";
             this.targetAuthor = "";
             this.targetTimestamp = 0;
-=======
+            }*/
         this.sticker = dataMessage.getSticker().isPresent() ? new JsonSticker(dataMessage.getSticker().get()) : null;
 
         if (dataMessage.getSharedContacts().isPresent()) {
@@ -150,7 +149,6 @@ class JsonDataMessage {
             this.contacts = List.of();
         }
     }
->>>>>>> upstream/master
 
 	}
 
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 4e7d911b..9f1937fd 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -12,17 +12,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import java.util.List;
 
 public class JsonMessageEnvelope {
-<<<<<<< HEAD
-    String source;
-    int sourceDevice;
-    String relay;
-    long timestamp;
-    JsonDataMessage dataMessage;
-    JsonSyncMessage syncMessage;
-    JsonCallMessage callMessage;
-    JsonReceiptMessage receiptMessage;
-    // String typingAction;
-=======
 
     @JsonProperty
     final String source;
@@ -56,7 +45,6 @@ public class JsonMessageEnvelope {
     @JsonProperty
     @JsonInclude(JsonInclude.Include.NON_NULL)
     final JsonTypingMessage typingMessage;
->>>>>>> upstream/master
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
@@ -81,30 +69,6 @@ public class JsonMessageEnvelope {
         } else {
             this.receiptMessage = null;
         }
-<<<<<<< HEAD
-        if (content != null) {
-            if (envelope.isUnidentifiedSender()) {
-                this.source = content.getSender().getLegacyIdentifier();
-                this.sourceDevice = content.getSenderDevice();
-            }
-            if (content.getDataMessage().isPresent()) {
-                this.dataMessage = new JsonDataMessage(content.getDataMessage().get(), m);
-            }
-            if (content.getSyncMessage().isPresent()) {
-                this.syncMessage = new JsonSyncMessage(content.getSyncMessage().get(), m);
-            }
-            if (content.getCallMessage().isPresent()) {
-                this.callMessage = new JsonCallMessage(content.getCallMessage().get());
-            }
-            if (content.getReceiptMessage().isPresent()) {
-                this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get());
-            }
-/*            if (content.getTypingMessage().isPresent()) {
-                SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
-                this.typingAction = content.getTypingMessage().get();
-           }
-*/        }
-=======
         this.typingMessage = content != null && content.getTypingMessage().isPresent()
                 ? new JsonTypingMessage(content.getTypingMessage().get())
                 : null;
@@ -118,7 +82,6 @@ public class JsonMessageEnvelope {
         this.callMessage = content != null && content.getCallMessage().isPresent()
                 ? new JsonCallMessage(content.getCallMessage().get())
                 : null;
->>>>>>> upstream/master
     }
 
     public JsonMessageEnvelope(Signal.MessageReceived messageReceived) {