anchor.diff:  
   	dat += "<a href='?_src_=prefs;preference=tab;tab=0' [current_tab == 0 ? "class='linkOn'" : ""]>Character Settings</a>"
   	dat += "<a href='?_src_=prefs;preference=tab;tab=1' [current_tab == 1 ? "class='linkOn'" : ""]>Game Preferences</a>"
  -<<<<<<< HEAD
  -	dat += "<a href='?_src_=prefs;preference=tab;tab=2' [current_tab == 2 ? "class='linkOn'" : ""]>Donator Preferences</a>" // yogs - Donor features
  -=======
   	dat += "<a href='?_src_=prefs;preference=tab;tab=2' [current_tab == 2 ? "class='linkOn'" : ""]>OOC Preferences</a>"
  ->>>>>>> ece7616f3b... Merge pull request #36558 from ShizCalev/player-pref-panel-revamp
  +	dat += "<a href='?_src_=prefs;preference=tab;tab=3' [current_tab == 3 ? "class='linkOn'" : ""]>Donator Preferences</a>" // yogs - Donor features
   
   	if(!path)
   		dat += "<div class='notice'>Please create an account to save your preferences</div>"
  
positive.code: 				dat += "<b>Quiet round:</b> <a href='?_src_=prefs;preference=donor;task=quiet_round'>[(src.toggles & QUIET_ROUND) ? "Yes" : "No"]</a><br>"
  			// yogs end
  			dat += "</td></tr></table>"
  
  <<<<<<< HEAD
  		// yogs start - Donor features
  		if (2) //Donator preferences
  			dat += "<table><tr><td width='500px' height='300px' valign='top'>"
  			dat += "<h2>Donator Preferences</h2>"
  			if(is_donator(user.client))
  
negative.code: 			else
  				dat += "<b><a href='http://www.yogstation.net/index.php?do=donate'>Donate here</b>"
  		// yogs end
  
  	dat += "<hr><center>"
  
  