diff --git a/MOVED b/MOVED
index 9df4f85f94ae..cde71b6e7bdf 100644
--- a/MOVED
+++ b/MOVED
@@ -1,7 +1,11 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
+<<<<<<< MOVED
 # $FreeBSD$
+=======
+# $FreeBSD$
+>>>>>>> 1.367
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -971,6 +975,9 @@ japanese/vfxdvi600||2004-03-04|removed (obsolate)
 games/gcompris|games/gcompris2|2004-03-05|removed, obsoleted, successor is gcompris2
 devel/pear||2004-03-06|removed, obsolete
 graphics/filmgimp|graphics/cinepaint|2004-03-06|renamed
+sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author
 x11-toolkits/qt32|x11-toolkits/qt33|2004-03-09|qt32 replaced by qt33
 mail/ksig|misc/ksig|2004-03-09|ksig is now a part of the kdeaddons ports
 mail/exim-old|mail/exim|2004-03-09|No security maintenance from author, successor is exim
+sysutils/xwatch||2004-03-09|obsolete-distfile deleted by author
+