anchor.diff:  
   	dat += "<b>Category:</b><ul>"
   	if(screen == CATEGORY_ATMOS)
  -<<<<<<< HEAD
  -		dat += "<span class='linkOn'>Atmospherics</span> <A href='?src=\ref[src];screen=[CATEGORY_DISPOSALS];dmake=0;type=0'>Disposals</A><BR>"
  -	else if(screen == CATEGORY_DISPOSALS)
  -		dat += "<A href='?src=\ref[src];screen=[CATEGORY_ATMOS];makepipe=[/obj/machinery/atmospherics/pipe/simple];dir=1;type=0'>Atmospherics</A> <span class='linkOn'>Disposals</span><BR>"
  -	var/generated_layer_list = ""
  -	var/layers_total = PIPING_LAYER_MAX - PIPING_LAYER_MIN + 1
  -	for(var/iter = PIPING_LAYER_MIN, iter <= layers_total, iter++)
  -		if(iter == piping_layer)
  -			generated_layer_list += "<span class='linkOn'><A href='?src=\ref[src];setlayer=[iter]'>[iter]</A></span>"
  -		else
  -			generated_layer_list += "<A href='?src=\ref[src];setlayer=[iter]'>[iter]</A>"
  -	dat += "Atmospherics Piping Layer: [generated_layer_list]<BR>"
  -=======
   		var/list/recipes = GLOB.disposal_pipe_recipes
   		var/datum/pipe_info/first_recipe = recipes[recipes[1]][1]
   		dat += "<span class='linkOn'>Atmospherics</span> "
  
positive.code: 			else
  				dirsel+={"
  		<p>
  <<<<<<< HEAD
  			<a href="?src=\ref[src];setdir=1; flipped=0" title="West, South, East">&#9574;</a>
  			<a href="?src=\ref[src];setdir=4; flipped=0" title="North, West, South">&#9571;</a>
  			<br />
  			<a href="?src=\ref[src];setdir=2; flipped=0" title="East, North, West">&#9577;</a>
  			<a href="?src=\ref[src];setdir=8; flipped=0" title="South, East, North">&#9568;</a>
  =======
  			<a href="?src=[REF(src)];setdir=[NORTH]" title="West, South, East">&#9574;</a>
  			<a href="?src=[REF(src)];setdir=[EAST]" title="North, West, South">&#9571;</a>
  			<br />
  			<a href="?src=[REF(src)];setdir=[SOUTH]" title="East, North, West">&#9577;</a>
  			<a href="?src=[REF(src)];setdir=[WEST]" title="South, East, North">&#9568;</a>
  >>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)
  		</p>
  				"}
  		if(PIPE_TRIN_M) // Mirrored ones
  
negative.code: 			else
  				dirsel+={"
  		<p>
  			<a href="?src=[REF(src)];setdir=[NORTH]" title="vertical">&#8597;</a>
  			<a href="?src=[REF(src)];setdir=[EAST]" title="horizontal">&harr;</a>
  			<br />
  