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=[NORTH]; flipped=0" title="North">&uarr;</a>
  			<a href="?src=\ref[src];setdir=[EAST]; flipped=0" title="East">&rarr;</a>
  			<a href="?src=\ref[src];setdir=[SOUTH]; flipped=0" title="South">&darr;</a>
  			<a href="?src=\ref[src];setdir=[WEST]; flipped=0" title="West">&larr;</a>
  =======
  			<a href="?src=[REF(src)];setdir=[NORTH]" title="North">&uarr;</a>
  			<a href="?src=[REF(src)];setdir=[EAST]" title="East">&rarr;</a>
  			<a href="?src=[REF(src)];setdir=[SOUTH]" title="South">&darr;</a>
  			<a href="?src=[REF(src)];setdir=[WEST]" title="West">&larr;</a>
  >>>>>>> 8b5cd7f... Disposal pipes and pipe dispensers refactor (#32435)
  		</p>
  					"}
  		if(PIPE_ONEDIR) // Single icon_state (eg 4-way manifolds)
  
negative.code: 	icon_state = initial(path.icon_state)
  	if(ispath(path, /obj/structure/disposalpipe))
  		icon_state = "con[icon_state]"
  	dirtype = dt
  
  /datum/pipe_info/disposal/Params()
  	return "dmake=[id]&type=[dirtype]"
  
  
  /obj/item/pipe_dispenser
  