--- a/lib/my_db.py	Sat Sep 27 01:44:43 2003 -0400
+++ b/lib/my_db.py	Sat Sep 27 03:17:30 2003 -0400
@@ -167,10 +167,10 @@
 			AND userid = %d
 			AND bookmark NOT IN 
 			  (SELECT bookmark FROM bookmarks_keywords
-			  WHERE userid = %d AND keyword = %d ))
+			  WHERE userid = %d AND keyword = %d )
 			;
 			""" % (into_id, merge_id, self.userid,
-			self.userid, merge_id))
+			self.userid, into_id))
 		self.remove_keyword(merge_id)
 	def get_all_keywords(self):
 		"""Return a list of doublets [id, keyword, count]."""