--- views.help.ini	2011-03-18 11:50:21.000000000 -0700
+++ viewsnew.help.ini	2011-03-19 03:44:30.000000000 -0700
@@ -213,7 +213,7 @@ weight = 140
 <<<<<<< HEAD
 [upgrading]
 title = "Upgrading your Views from Drupal 6 to Drupal 7"
-=======
+
 [updating]
 title = "Updating your views from Views 1 to Views 2"
 weight = 150