diff --git a/package-lock.json b/package-lock.json
index 0b280cf..d95487e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1534,7 +1534,6 @@
       "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "ansi-align": "^2.0.0",
         "camelcase": "^4.0.0",
         "chalk": "^2.0.1",
@@ -1542,15 +1541,6 @@
         "string-width": "^2.0.0",
         "term-size": "^1.2.0",
         "widest-line": "^2.0.0"
-=======
-        "ansi-align": "2.0.0",
-        "camelcase": "4.1.0",
-        "chalk": "2.4.2",
-        "cli-boxes": "1.0.0",
-        "string-width": "2.1.1",
-        "term-size": "1.2.0",
-        "widest-line": "2.0.1"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       },
       "dependencies": {
         "camelcase": {
@@ -1716,7 +1706,6 @@
       "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "bluebird": "^3.5.1",
         "chownr": "^1.0.1",
         "glob": "^7.1.2",
@@ -1730,21 +1719,6 @@
         "ssri": "^5.2.4",
         "unique-filename": "^1.1.0",
         "y18n": "^4.0.0"
-=======
-        "bluebird": "3.5.3",
-        "chownr": "1.1.1",
-        "glob": "7.1.3",
-        "graceful-fs": "4.1.15",
-        "lru-cache": "4.1.5",
-        "mississippi": "2.0.0",
-        "mkdirp": "0.5.1",
-        "move-concurrently": "1.0.1",
-        "promise-inflight": "1.0.1",
-        "rimraf": "2.6.3",
-        "ssri": "5.3.0",
-        "unique-filename": "1.1.1",
-        "y18n": "4.0.0"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "cache-base": {
@@ -2322,21 +2296,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "aproba": "^1.1.1",
         "fs-write-stream-atomic": "^1.0.8",
         "iferr": "^0.1.5",
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
-=======
-        "aproba": "1.2.0",
-        "fs-write-stream-atomic": "1.0.10",
-        "iferr": "0.1.5",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.3",
-        "run-queue": "1.0.3"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "copy-descriptor": {
@@ -2911,21 +2876,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "globby": "^6.1.0",
         "is-path-cwd": "^1.0.0",
         "is-path-in-cwd": "^1.0.0",
         "p-map": "^1.1.1",
         "pify": "^3.0.0",
         "rimraf": "^2.2.8"
-=======
-        "globby": "6.1.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.1",
-        "p-map": "1.2.0",
-        "pify": "3.0.0",
-        "rimraf": "2.6.3"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       },
       "dependencies": {
         "globby": {
@@ -3769,7 +3725,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4184,7 +4141,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4240,6 +4198,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "2.1.1"
           }
@@ -4283,12 +4242,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5399,11 +5360,7 @@
       "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "chalk": "^2.0.1"
-=======
-        "chalk": "2.4.2"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "longest": {
@@ -5708,21 +5665,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "aproba": "^1.1.1",
         "copy-concurrently": "^1.0.0",
         "fs-write-stream-atomic": "^1.0.8",
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
-=======
-        "aproba": "1.2.0",
-        "copy-concurrently": "1.0.5",
-        "fs-write-stream-atomic": "1.0.10",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.3",
-        "run-queue": "1.0.3"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "ms": {
@@ -6042,17 +5990,10 @@
       "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "chalk": "^2.1.0",
         "cli-cursor": "^2.1.0",
         "cli-spinners": "^1.0.1",
         "log-symbols": "^2.1.0"
-=======
-        "chalk": "2.4.2",
-        "cli-cursor": "2.1.0",
-        "cli-spinners": "1.3.1",
-        "log-symbols": "2.2.0"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "os-browserify": {
@@ -6316,15 +6257,9 @@
       "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "chalk": "^2.4.1",
         "source-map": "^0.6.1",
         "supports-color": "^5.4.0"
-=======
-        "chalk": "2.4.2",
-        "source-map": "0.6.1",
-        "supports-color": "5.5.0"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "postcss-calc": {
@@ -9107,7 +9042,7 @@
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "^7.1.3"
       }
     },
     "ripemd160": {
@@ -9798,15 +9733,9 @@
       "integrity": "sha512-K6E52DbYyzGNXGyv2LhI2Duomr3t/2FFMmnGdHZ1Ruk3ulFHDMASJtg3WpA3CXlWODZx189tTaOIO5mWkSKyVg==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "del": "^3.0.0",
         "sw-precache": "^5.2.1",
         "uglify-es": "^3.3.9"
-=======
-        "del": "3.0.0",
-        "sw-precache": "5.2.1",
-        "uglify-es": "3.3.10"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "sw-toolbox": {
@@ -9988,13 +9917,8 @@
       "integrity": "sha512-rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
-        "commander": "~2.13.0",
+        "commander": "~2.14.1",
         "source-map": "~0.6.1"
-=======
-        "commander": "2.14.1",
-        "source-map": "0.6.1"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       },
       "dependencies": {
         "commander": {
@@ -10204,7 +10128,6 @@
       "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "boxen": "^1.2.1",
         "chalk": "^2.0.1",
         "configstore": "^3.0.0",
@@ -10215,18 +10138,6 @@
         "latest-version": "^3.0.0",
         "semver-diff": "^2.0.0",
         "xdg-basedir": "^3.0.0"
-=======
-        "boxen": "1.3.0",
-        "chalk": "2.4.2",
-        "configstore": "3.1.2",
-        "import-lazy": "2.1.0",
-        "is-ci": "1.2.1",
-        "is-installed-globally": "0.1.0",
-        "is-npm": "1.0.0",
-        "latest-version": "3.1.0",
-        "semver-diff": "2.1.0",
-        "xdg-basedir": "3.0.0"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "upper-case": {
@@ -10368,7 +10279,7 @@
       "resolved": "https://registry.npmjs.org/vue-gallery/-/vue-gallery-1.5.0.tgz",
       "integrity": "sha512-eOUIfzTBA+ylZUgfM8piT4wzJ4LHTCHTU4i5AbqApTBzZHBXFBB4YIRCEthe+GK35kPav7kTwTLzvUeuAasTgg==",
       "requires": {
-        "blueimp-gallery": "2.33.0"
+        "blueimp-gallery": "^2.33.0"
       }
     },
     "vue-hot-reload-api": {
@@ -10528,7 +10439,6 @@
       "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
       "dev": true,
       "requires": {
-<<<<<<< HEAD
         "acorn": "^5.3.0",
         "bfj-node4": "^5.2.0",
         "chalk": "^2.3.0",
@@ -10541,20 +10451,6 @@
         "mkdirp": "^0.5.1",
         "opener": "^1.4.3",
         "ws": "^4.0.0"
-=======
-        "acorn": "5.7.3",
-        "bfj-node4": "5.3.1",
-        "chalk": "2.4.2",
-        "commander": "2.17.1",
-        "ejs": "2.6.1",
-        "express": "4.16.4",
-        "filesize": "3.6.1",
-        "gzip-size": "4.1.0",
-        "lodash": "4.17.11",
-        "mkdirp": "0.5.1",
-        "opener": "1.5.1",
-        "ws": "4.1.0"
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
       }
     },
     "webpack-dev-middleware": {
diff --git a/src/components/Programs.vue b/src/components/Programs.vue
index b3f47d6..a3f58c2 100644
--- a/src/components/Programs.vue
+++ b/src/components/Programs.vue
@@ -1,27 +1,16 @@
 <template>
   <div>
     <v-toolbar tabs>
-
-<<<<<<< HEAD
-      <v-toolbar-title>Hackathon v1.0 <span class="subheading">Youth and Entrepreunership</span> </v-toolbar-title>
-=======
-      <v-toolbar-title>Hackathon v1.0 <span class="subheading">"Youth and Entrepreneurship"</span></v-toolbar-title>
-      
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
+      <v-toolbar-title>
+        Hackathon v1.0
+        <span class="subheading">"Youth and Entrepreneurship"</span>
+      </v-toolbar-title>
 
       <v-spacer></v-spacer>
 
       <span class="caption">Nov 16 to 18, 2018 @American Center, Addis Ababa</span>
-     
-
-      <v-tabs
-        slot="extension"
-        v-model="tabs"
-        fixed-tabs
-        icons-and-text
-        centered
 
-      >
+      <v-tabs slot="extension" v-model="tabs" fixed-tabs icons-and-text centered>
         <v-tabs-slider></v-tabs-slider>
 
         <v-tab v-for="(tab, key) in tabList" :key="key" :href="'#tab-'+ key">
@@ -32,92 +21,53 @@
     </v-toolbar>
 
     <v-tabs-items v-model="tabs" class="elevation-1">
-<<<<<<< HEAD
-      <v-tab-item v-for="i in 6" :id="'tab-' + i" :key="i">
-        <v-container fluid>
-          <intro v-if="i == 1"></intro>
-          <team v-if="i == 2"></team>
-          <schedule v-if="i == 3"></schedule>
-          <winner v-if="i == 4"></winner>
-          <gallery v-if="i == 5"></gallery>
-          <discussion v-if="i == 6"></discussion>
-        </v-container>
-          
-=======
       <v-tab-item v-for="(tab, i) in tabList" :id="'tab-' + i" :key="i">
-          <v-card flat>
-            <v-card-text>
-              <intro-page v-if="i == 0"></intro-page>
-              <teams-page v-if="i == 1"></teams-page>
-              <schedule-page v-if="i == 2"></schedule-page>
-              <guideline-page v-if="i == 3"></guideline-page>
-              <winners-page v-if="i == 4"></winners-page>
-              <gallery-page v-if="i == 5"></gallery-page>
-              <discussion-page v-if="i == 6"></discussion-page>
-              
-              </v-card-text>
-          </v-card>
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
-        </v-tab-item>
+        <v-card flat>
+          <v-card-text>
+            <intro-page v-if="i == 0"></intro-page>
+            <teams-page v-if="i == 1"></teams-page>
+            <schedule-page v-if="i == 2"></schedule-page>
+            <guideline-page v-if="i == 3"></guideline-page>
+            <winners-page v-if="i == 4"></winners-page>
+            <gallery-page v-if="i == 5"></gallery-page>
+            <discussion-page v-if="i == 6"></discussion-page>
+          </v-card-text>
+        </v-card>
+      </v-tab-item>
     </v-tabs-items>
   </div>
 </template>
 <script>
-
-<<<<<<< HEAD
-import Introduction from './programs/Introduction.vue';
-import Teams from './programs/Teams.vue';
-import Schedules from './programs/Schedules.vue'
-import Winners from './programs/Winners.vue'
-import Gallery from './programs/Gallery.vue'
-import Discussion from './programs/Discussion.vue'
-
-//Mixins
-import appMixins from "../mixins/appMixins.js";
-
-export default {
-  mixins: [appMixins],
-  components:{
-    "intro":Introduction,
-    "team": Teams,
-    "schedule": Schedules,
-    "winner": Winners,
-    "gallery": Gallery,
-    "discussion": Discussion
-=======
-import Intro from './programPages/Intro.vue';
-import Teams from './programPages/Teams.vue';
-import Schedule from './programPages/Schedule.vue';
-import Guideline from './programPages/Guideline.vue';
-import Winners from './programPages/Winners.vue';
-import Gallery from './programPages/Gallery.vue';
-import Discussion from './programPages/Discussion.vue';
+import Intro from "./programPages/Intro.vue";
+import Teams from "./programPages/Teams.vue";
+import Schedule from "./programPages/Schedule.vue";
+import Guideline from "./programPages/Guideline.vue";
+import Winners from "./programPages/Winners.vue";
+import Gallery from "./programPages/Gallery.vue";
+import Discussion from "./programPages/Discussion.vue";
 
 export default {
   components: {
-    'intro-page': Intro,
-    'teams-page': Teams,
-    'schedule-page': Schedule,
-    'guideline-page': Guideline,
-    'winners-page': Winners,
-    'gallery-page': Gallery,
-    'discussion-page': Discussion
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
+    "intro-page": Intro,
+    "teams-page": Teams,
+    "schedule-page": Schedule,
+    "guideline-page": Guideline,
+    "winners-page": Winners,
+    "gallery-page": Gallery,
+    "discussion-page": Discussion,
   },
   data() {
     return {
       tabs: null,
-<<<<<<< HEAD
-      
-=======
+
       tabList: [
         {
           title: "Introduction",
-          icon: "speaker_notes"
-        }, 
+          icon: "speaker_notes",
+        },
         {
           title: "Teams",
-          icon: "people"
+          icon: "people",
         },
         {
           title: "Schedule",
@@ -125,25 +75,24 @@ export default {
         },
         {
           title: "Guideline",
-          icon: "book"
+          icon: "book",
         },
         {
           title: "Winners",
-          icon: "card_giftcard"
+          icon: "card_giftcard",
         },
         {
           title: "Gallery",
-          icon: "collections"
+          icon: "collections",
         },
         {
           title: "Discussion",
-          icon: "forum"
-        }
+          icon: "forum",
+        },
       ],
       text:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
+        "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
     };
-  }
+  },
 };
 </script>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 7f377f0..914cbec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,7 +25,7 @@ import {
   VImg,
   transitions,
   VSlider,
-  
+
 } from 'vuetify'
 import '../node_modules/vuetify/src/stylus/app.styl'
 
@@ -48,14 +48,9 @@ Vue.use(Vuetify, {
     VSwitch,
     VDivider,
     VTabs,
-<<<<<<< HEAD
-    transitions,
-    VSlider
-=======
     VSheet,
     VImg,
     transitions
->>>>>>> a676acda3e5803158470e8d3babe98359202e349
   }
 })