merge fix

src/interaction/main/mainLinks.js

@@ -259,6 +259,9 @@ App.UI.View.mainLinks = function() {
 					V.market.slaveMarket = abbreviation;
 					V.market.newSlaves = [];
 					V.market.numArcology = 1;
+					V.nextButton = "Back to Main";
+					V.nextLink = "Main";
+					V.returnTo = "Main";
 				}),
 			App.UI.DOM.makeElement("span", " will sell at half price this week.", "yellow"));
 		fragment.append(div);