diff --git a/client/src/modules/config.ts b/client/src/modules/config.ts
index 1fbaab8..cb7cbda 100644
--- a/client/src/modules/config.ts
+++ b/client/src/modules/config.ts
@@ -3,8 +3,13 @@ import * as I from "../types/types";
 export const config: I.Config = {
     childHasVenueXML: false,
     debug: true,
+<<<<<<< HEAD
     branch: "master",
     version: "0.0.1",
+=======
+    branch: "staging",
+    version: "0.2.0",
+>>>>>>> origin/staging
     maxSelectedSeats: 10,
     resources: {
         master: {