Fix compilation after merge

client/windows/CTradeWindow.cpp

@@ -1250,7 +1250,7 @@ void CAltarWindow::makeDeal()
 		std::sort(positions.begin(), positions.end(), std::greater<>());
 
 		LOCPLINT->cb->trade(market, mode, positions, {}, {}, hero);
-		arts->artifactsOnAltar.clear();
+		artifactsOfHero->artifactsOnAltar.clear();
 
 		for(auto item : items[0])
 		{

config/objects/generic.json

@@ -54,7 +54,7 @@
 					"rarity"	: 100
 				},
 				"modes" : ["resource-resource", "resource-player"],
-				"efficacy" : 5,
+				"efficiency" : 5,
 				"title" : "core.genrltxt.159"
 			}
 		}
@@ -78,7 +78,7 @@
 					"rarity"	: 100
 				},
 				"modes" : ["resource-resource", "resource-player"],
-				"efficacy" : 5,
+				"efficiency" : 5,
 				"title" : "core.genrltxt.159"
 			}
 		}