anchor.diff:  		Traits are applied at roundstart and cannot normally be removed.</div>"
   		dat += "<center><a href='?_src_=prefs;preference=trait;task=close'>Done</a></center>"
   		dat += "<hr>"
  +<<<<<<< HEAD
   		dat += "<center><b>Current traits:</b> [all_traits.len ? all_traits.Join(", ") : "None"]</center>"
   		dat += "<center>[all_traits.len] / [MAX_TRAITS] max traits<br>\
   		<b>Trait balance remaining:</b> [GetTraitBalance()]</center><br>"
  
positive.code: 						neutral_traits -= trait
  						all_traits -= trait
  					else
  						if(all_traits.len >= MAX_TRAITS)
  							to_chat(user, "<span class='warning'>You can't have more than [MAX_TRAITS] traits!</span>")
  							return
  						neutral_traits += trait
  						all_traits += trait
  				else
  					var/balance = GetTraitBalance()
  					if(trait in positive_traits)
  
negative.code: 			var/trait_name = initial(T.name)
  			var/has_trait
  			var/trait_cost = initial(T.value) * -1
  =======
  		dat += "<center><b>Current quirks:</b> [all_quirks.len ? all_quirks.Join(", ") : "None"]</center>"
  		dat += "<center>[positive_quirks.len] / [MAX_QUIRKS] max positive quirks<br>\
  		<b>Quirk balance remaining:</b> [GetQuirkBalance()]</center><br>"
  		for(var/V in SSquirks.quirks)
  			var/datum/quirk/T = SSquirks.quirks[V]
  			var/quirk_name = initial(T.name)
  			var/has_quirk
  			var/quirk_cost = initial(T.value) * -1
  >>>>>>> e74f33d... Quirk limit now only applies to positive quirks
  			var/lock_reason = "This trait is unavailable."
  			var/trait_conflict = FALSE
  			for(var/_V in all_traits)
  