--- a/model/provbib.js	Wed Nov 21 12:24:54 2012 +0000
+++ b/model/provbib.js	Wed Nov 21 12:33:26 2012 +0000
@@ -32,11 +32,7 @@
           "James Cheney; ed. "+
           "<a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsED\"><cite>Formal Semantics of PROV</cite></a>. "+
           "2011, Work in progress. "+
-<<<<<<< local
           "URL: <a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsED\">http://www.w3.org/2011/prov/wiki/FormalSemanticsED</a>.",
-=======
-          "URL: <a href=\"http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman\">http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman</a> ",
->>>>>>> other
 
         "PROV-PRIMER":
           "Yolanda Gil; Simon Miles; eds. "+