diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
index 30dfa7c6e3..ba8d7f3275 100644
--- a/node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
+++ b/node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
@@ -707,7 +707,8 @@ internal class SingleThreadedStateMachineManager(
         val sender = serviceHub.networkMapCache.getPeerByLegalName(peer)
         if (sender != null) {
             when (sessionMessage) {
-                is ExistingSessionMessage -> onExistingSessionMessage(sessionMessage, sender, event, event.receivedMessage.uniqueMessageId, event.receivedMessage.senderUUID, event.receivedMessage.senderSeqNo)
+                is ExistingSessionMessage -> onExistingSessionMessage(sessionMessage, sender, event,
+                        event.receivedMessage.uniqueMessageId, event.receivedMessage.senderUUID, event.receivedMessage.senderSeqNo)
                 is InitialSessionMessage -> onSessionInit(sessionMessage, sender, event)
             }
         } else {
diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineState.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineState.kt
index 9a2e51c485..91ecc1477f 100644
--- a/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineState.kt
+++ b/node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineState.kt
@@ -244,7 +244,6 @@ data class Checkpoint(
 }
 
 /**
-<<<<<<< HEAD
  * @param invocationContext The initiator of the flow.
  * @param ourIdentity The identity the flow is run as.
  * @param sessions Map of source session ID to session state.
diff --git a/node/src/main/resources/migration/node-core.changelog-v21.xml b/node/src/main/resources/migration/node-core.changelog-v21.xml
index 5bb47efae5..bf5bf67081 100644
--- a/node/src/main/resources/migration/node-core.changelog-v21.xml
+++ b/node/src/main/resources/migration/node-core.changelog-v21.xml
@@ -23,6 +23,8 @@
             </column>
         </createTable>
         <addPrimaryKey columnNames="session_id" constraintName="node_session_data_pk" tableName="node_session_data"/>
+
+        <dropTable tableName="node_message_ids"/>
     </changeSet>
 
 </databaseChangeLog>
\ No newline at end of file