diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index f5b42d453c..07dc3e7bc0 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1,9 @@
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
+=======
+<<<<<<< HEAD
+Wed Jan  7 11:24:56 PST 2015
+=======
+Tue Jan  6 20:12:24 CST 2015
+>>>>>>> sofia update
+>>>>>>> sofia update