diff --cc src/company_gui.cpp
index c62c6d61cf,f39b8229c3..0000000000
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@@ -2194,16 -2219,18 +2219,23 @@@ struct CompanyWindow : Windo
  				uint y = r.top;
  
  				/* Collect rail and road counts. */
 -				uint rail_pices = c->infrastructure.signal;
 +				uint rail_pieces = c->infrastructure.signal;
  				uint road_pieces = 0;
++<<<<<<< HEAD
 +				for (uint i = 0; i < lengthof(c->infrastructure.rail); i++) rail_pieces += c->infrastructure.rail[i];
 +				for (uint i = 0; i < lengthof(c->infrastructure.road); i++) road_pieces += c->infrastructure.road[i];
++=======
+ 				for (uint i = 0; i < lengthof(c->infrastructure.rail); i++) rail_pices += c->infrastructure.rail[i];
+ 				for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) {
+ 					for (uint i = 0; i < lengthof(c->infrastructure.road[rt]); i++) road_pieces += c->infrastructure.road[rt][i];
+ 				}
++>>>>>>> Feature: Add NotRoadTypes (NRT)
  
 -				if (rail_pices == 0 && road_pieces == 0 && c->infrastructure.water == 0 && c->infrastructure.station == 0 && c->infrastructure.airport == 0) {
 +				if (rail_pieces == 0 && road_pieces == 0 && c->infrastructure.water == 0 && c->infrastructure.station == 0 && c->infrastructure.airport == 0) {
  					DrawString(r.left, r.right, y, STR_COMPANY_VIEW_INFRASTRUCTURE_NONE);
  				} else {
 -					if (rail_pices != 0) {
 -						SetDParam(0, rail_pices);
 +					if (rail_pieces != 0) {
 +						SetDParam(0, rail_pieces);
  						DrawString(r.left, r.right, y, STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL);
  						y += FONT_HEIGHT_NORMAL;
  					}
diff --cc src/pathfinder/npf/npf.cpp
index 9535ac0636,bdead0d987..0000000000
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@@ -1114,8 -1125,8 +1126,13 @@@ FindDepotData NPFRoadVehicleFindNearest
  {
  	Trackdir trackdir = v->GetVehicleTrackdir();
  
++<<<<<<< HEAD
 +	AyStarUserData user = { v->owner, TRANSPORT_ROAD, INVALID_RAILTYPES, v->compatible_roadtypes };
 +	NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, INVALID_TILE, INVALID_TRACKDIR, false, NULL, &user, 0, max_penalty);
++=======
+ 	AyStarUserData user = { v->owner, TRANSPORT_ROAD, INVALID_RAILTYPES, v->rtid.basetype, v->compatible_subtypes };
+ 	NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, v->tile, ReverseTrackdir(trackdir), false, NULL, &user, 0);
++>>>>>>> Feature: Add NotRoadTypes (NRT)
  
  	if (ftd.best_bird_dist != 0) return FindDepotData();
  
@@@ -1204,8 -1215,8 +1221,13 @@@ FindDepotData NPFTrainFindNearestDepot(
  	fstd.reserve_path = false;
  
  	assert(trackdir != INVALID_TRACKDIR);
++<<<<<<< HEAD
 +	AyStarUserData user = { v->owner, TRANSPORT_RAIL, v->compatible_railtypes, ROADTYPES_NONE };
 +	NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, last->tile, trackdir_rev, false, &fstd, &user, NPF_INFINITE_PENALTY, max_penalty);
++=======
+ 	AyStarUserData user = { v->owner, TRANSPORT_RAIL, v->compatible_railtypes, INVALID_ROADTYPE, ROADSUBTYPES_NONE };
+ 	NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, last->tile, trackdir_rev, false, &fstd, &user, NPF_INFINITE_PENALTY);
++>>>>>>> Feature: Add NotRoadTypes (NRT)
  	if (ftd.best_bird_dist != 0) return FindDepotData();
  
  	/* Found target */