anchor.diff:    let readCommentAndCommands (ctx:ReadingContext) xmlSig = 
       match ctx.XmlMemberLookup(xmlSig) with 
       | None -> 
  +=======
  +  let readCommentAndCommands (ctx:ReadingContext) xmlSig =
  +    match ctx.XmlMemberLookup(xmlSig) with
  +    | None ->
  +>>>>>>> origin/master
           if not (System.String.IsNullOrEmpty xmlSig) then
               Log.verbf "Could not find documentation for '%s'! (You can ignore this message when you have not written documentation for this member)" xmlSig
           dict[], Comment.Empty
  
positive.code:           let value = if sum = null then el.Value else sum.Value
            let lines = removeSpaces value
            let cmds = new System.Collections.Generic.Dictionary<_, _>()
            let findCommand = (function
                  | String.StartsWithWrapped ("[", "]") (ParseCommand(k, v), rest) -> 
                      Some (k, v)
  
negative.code:                     cmds.Add(k, v)
                      false
                  | _ -> true)) |> String.concat "\n"
  =======
            let text =
              lines |> Seq.filter (function
                | String.StartsWithWrapped ("[", "]") (ParseCommand(k, v), rest) ->
                    cmds.Add(k, v)
                    false
                | _ -> true) |> String.concat "\n"
  >>>>>>> origin/master
            let doc =
              Literate.ParseMarkdownString
                ( text, path=Path.Combine(ctx.AssemblyPath, "docs.fsx"),
  