Errors fixed

bibliobase.bib

@@ -62267,22 +62267,12 @@
 }
 
 @PhdThesis{rao2002standing,
-<<<<<<< HEAD
-	Title = {Standing one's ground: gender, land and livelihoods
-                  in the Santal Parganas, Jharkhand, {I}ndia},
-	Author = {Rao, Nitya},
-	School = {University of East Anglia},
-	Year = 2002,
-	Date-added = {2014-04-19 08:46:04 +0000},
-	Date-modified = {2014-04-19 08:46:04 +0000}
-=======
   Title =        {Standing one's ground: gender, land and livelihoods in the Santal Parganas, Jharkhand, {I}ndia},
   Author =       {Rao, Nitya},
   School =       {University of East Anglia},
   Year =         2002,
   Date-added =   {2014-04-19 08:46:04 +0000},
   Date-modified ={2014-04-19 08:46:04 +0000}
->>>>>>> iupdate
 }
 
 @Article{rao2003mechanisation,