Fix conflict

diff --cc extra/rss/rss.factor
index 0e78208f8666ba91c9da67387121ab6d2a7c3e57,f9d7067e589f7d2890c87e0ffb5ed2d07651f43c..cfb1c903e852179eb198ccd072199d6db37abd3f
--- 1/extra/rss/rss.factor
--- 2/extra/rss/rss.factor
+++ b/extra/rss/rss.factor
@@@ -84,15 -88,12 +88,15 @@@ C: <entry> entr
  : simple-tag, ( content name -- )
      [ , ] tag, ;
  
 +: simple-tag*, ( content name attrs -- )
 +    [ , ] tag*, ;
 +
  : entry, ( entry -- )
      "entry" [
 -        dup entry-title "title" simple-tag,
 +        dup entry-title "title" { { "type" "html" } } simple-tag*,
          "link" over entry-link "href" associate contained*,
          dup entry-pub-date "published" simple-tag,
-         entry-description "content" { { "type" "html" } } simple-tag*,
 -        entry-description [ "content" simple-tag, ] when*
++        entry-description [ "content" { { "type" "html" } } simple-tag*, ] when*
      ] tag, ;
  
  : feed>xml ( feed -- xml )