diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 057976b4c1..4b6b39e5d0 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1,5 @@
+<<<<<<< HEAD
 Mon Jan 15 01:36:14 EST 2018
+=======
+Tue Nov 14 12:28:03 CST 2017
+>>>>>>> 96a8ad2378... FS-10762: [freeswitch-core] Websocket logic error #resolve