diff --git a/src/components/Nav.svelte b/src/components/Nav.svelte
index a278988..6ace459 100644
--- a/src/components/Nav.svelte
+++ b/src/components/Nav.svelte
@@ -1,5 +1,4 @@
 <script>
-<<<<<<< HEAD
   import { onMount } from 'svelte';
   import { goto, stores } from "@sapper/app";
   import { post } from "auth.js";
@@ -76,85 +75,5 @@
 			</div>
 		{/if}
 	</div>
-=======
-	import { goto, stores } from "@sapper/app";
-	import { post } from "auth.js";
-
-	export let segment;
-
-	const { session } = stores();
-
-	async function logout() {
-		await post(`auth/logout`);
-		$session.user = null;
-		goto("/");
-	}
-	  
-</script>
-
-<style>
-	nav, ul {
-		display: flex;
-	}
-	nav {
-		flex-direction: column;
-		align-self: center;
-	}
-	ul {
-		justify-content: center;
-		list-style-type: none;
-		padding: 0;
-	}
-	li {
-		margin: auto 1rem;
-	}
-	.logo {
-		display: none;
-		justify-content: center;
-        width: 120px;
-		margin: 1rem auto 0;
-	}
-	
-	.primary-link {
-    font-family: 'Poppins', sans-serif;
-    font-weight: 500;
-    font-size: 14px;
-    color: #117BCC;
-	text-decoration: none;
-  }
-
-	.primary-link:hover {
-		color: #0c5e9c;
-		text-decoration: underline;
-	}
-	@media (min-width: 769px) {
-		nav {
-		flex-direction: row;
-		justify-content: space-between;
-		}
-		.logo {
-			margin-top: 0;
-			align-self: center;
-			margin-left: 2rem;
-		}
-	}
-</style>
-
-<nav>
-	<img class="logo" src="https://picsum.photos/seed/picsum/100/50" alt="Project Login Logo" loading="lazy" width="120">
-	<ul>
-		<li><a class="primary-link" aria-current='{segment === undefined ? "page" : undefined}' href='.'>home</a></li>
-		{#if !$session.user}
-			<li><a class="primary-link" aria-current='{segment === "register" ? "page" : undefined}' href='register'>Register</a></li>
-			<li><a class="primary-link" aria-current='{segment === "login" ? "page" : undefined}' href='login'>Login</a></li>
-			<li><a class="primary-link" aria-current='{segment === "forgot" ? "page" : undefined}' href='forgot'>Forgot</a></li>
-		{/if}
-		{#if $session.user}
-			<li><a class="primary-link" aria-current='{segment === "dashboard" ? "page" : undefined}' href='dashboard'>Dashboard</a></li>
-			<li><a class="primary-link" aria-current='{segment === "projects" ? "page" : undefined}' href='projects'>Projects</a></li>
-			<li><a class="primary-link" aria-current='{segment === "logout" ? "page" : undefined}' href='.' on:click={logout}>Logout</a></li>
-		{/if}
-	</ul>
->>>>>>> dev
 </nav>
 <Sidebar bind:toggle={active} />
\ No newline at end of file
diff --git a/src/components/UI/Button.svelte b/src/components/UI/Button.svelte
index 8396770..b204fcc 100644
--- a/src/components/UI/Button.svelte
+++ b/src/components/UI/Button.svelte
@@ -1,5 +1,4 @@
 <script>
-<<<<<<< HEAD
   export let type = "button";
   export let mode = null;
   export let href = null;
@@ -36,112 +35,3 @@ button:focus {
     outline: none;
 }
 </style>
-=======
-    export let type = "button";
-    export let href = null;
-    export let mode = null;
-    export let color = null;
-    export let disabled = false;
-</script>
-
-<style>
-
-  button {
-    font-family: 'Poppins', sans-serif;
-    font-weight: 400;
-    font-size: 14px;
-    border-radius: 4px;
-    border: none;
-    padding: 8px 16px;
-    text-transform: uppercase;
-    cursor: pointer;
-  }
-
-  .primary {
-    background-color: #117BCC;
-    color: #FFFFFF;
-  }
-
-  .primary:hover,
-  .primary:focus {
-    background: #2B95E6;
-    box-shadow: 0px 1px 3px rgba(43, 149, 230, 0.45);
-    outline: 0;
-  }
-
-  .primary:active {
-    background: #0062B3;
-  }
-
-  .primary:disabled,
-  .primary:disabled:hover,
-  .primary:disabled:active {
-    background: #E0E0E0;
-    color: #BDBDBD;
-    box-shadow: none;
-    cursor: not-allowed;
-  }
-
-  .primary-outline {
-    border: 1px solid #2B95E6;
-    background-color: #FFF;
-    color: #2B95E6;
-  }
-
-  .primary-outline:hover,
-  .primary-outline:focus {
-    border: 1px solid #0062B3;
-    color: #0062B3;
-  }
-
-  .primary-outline:active {
-    border: 1px solid #2B95E6;
-    background: #C5E0F4;
-  }
-
-  .primary-outline:disabled,
-  .primary-outline:disabled:hover,
-  .primary-outline:disabled:active {
-    background: #E0E0E0;
-    color: #BDBDBD;
-    box-shadow: none;
-    cursor: not-allowed;
-  }
-
-  .primary-link {
-    font-family: 'Poppins', sans-serif;
-    font-weight: 500;
-    font-size: 14px;
-    color: #117BCC;
-    text-decoration: none;
-  }
-
-  .primary-link:hover {
-    color: #0c5e9c;
-  }
-
-  .secondary-link {
-    font-family: 'Poppins', sans-serif;
-    font-weight: 500;
-    font-size: 11px;
-    color: #9e9e9e;
-    text-decoration: none;
-    margin: 0 8px;
-  }
-
-  .secondary-link:hover {
-    color: #757575;
-  }
-
-</style>
-
-{#if href}
-    <a class="{color}" {href}>
-      <slot />
-    </a>
-{:else}
-    <button class="{mode} {color}" type="{type}" on:click {disabled} >
-      <slot />
-    </button>
-{/if}
->>>>>>> dev
diff --git a/src/components/UI/TextInput.svelte b/src/components/UI/TextInput.svelte
index 9225f48..4845b20 100644
--- a/src/components/UI/TextInput.svelte
+++ b/src/components/UI/TextInput.svelte
@@ -79,11 +79,7 @@
   .banned {
     position: absolute;
     right: 19px;
-<<<<<<< HEAD
     top: 29px;
-=======
-    top: 28px;
->>>>>>> dev
     height: 15px;
     width: 0px;
     border-bottom: 3px solid rgba(0, 0, 0, 0.38);
@@ -94,13 +90,8 @@
   }
 
   .invert {
-<<<<<<< HEAD
     right: 16px;
     top: 30px;
-=======
-    right: 19px;
-    top: 25px;
->>>>>>> dev
     height: 15px;
     width: 0px;
     border-bottom: 6px solid #FFF;
diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 200ab9b..d87f141 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -4,11 +4,7 @@
 	const { path } = page;
 
 	// Protected Routes
-<<<<<<< HEAD
-	const loginRoutes = ["/dashboard", "/settings","/projects", "/accounts" , "/account"];
-=======
-	const loginRoutes = ["/dashboard", "/settings","/projects"];
->>>>>>> dev
+	const loginRoutes = ["/dashboard", "/settings", "/accounts" , "/account"];
 	// Public Routes
     const logoutRoutes = ["/login", "/register", "/forgot"];
 
@@ -27,27 +23,8 @@
 	export let segment;
 </script>
 
-<<<<<<< HEAD
 <Nav {segment}/>
 
 <main class="h-nav-mobile w-screen md:h-nav-desktop">
-=======
-<style>
-	main {
-		position: relative;
-		background: #F6F6F6;
-		height: calc(100vh - 49px);
-		width: 100%;
-	}
-
-	@media (min-width: 600px) {
-
-	}
-</style>
-
-<Nav {segment}/>
-
-<main>
->>>>>>> dev
 	<slot></slot>
 </main>
\ No newline at end of file
diff --git a/src/routes/dashboard/index.svelte b/src/routes/dashboard/index.svelte
deleted file mode 100644
index 4ee2a2b..0000000
--- a/src/routes/dashboard/index.svelte
+++ /dev/null
@@ -1,102 +0,0 @@
-<script>
-    import { goto, stores } from '@sapper/app';
-    import Button from '../../components/UI/Button.svelte';
-
-    function onSubmit() {
-        goto('/')
-    }
-</script>
-
-<style>
-    .dashboard-wrapper {
-        display: flex;
-        flex-direction: row;
-        height: calc(100vh - 49px);
-    }
-
-    .dash-section {
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-    }
-
-    .dash {
-        margin: 0 24px;
-    }
-
-    .picture {
-        height: 120px;
-        width: 100%;
-        overflow: hidden;
-        background-image: url('https://images.pexels.com/photos/1533720/pexels-photo-1533720.jpeg?auto=compress&cs=tinysrgb&dpr=2&w=1980');
-        background-position: center;
-        background-size: cover;
-        filter: grayscale(100%);
-        opacity: 0.8;
-    }
-
-    .dash img {
-        width: 120px;
-        margin: 32px 0;
-    }
-
-    hr {
-        margin: 0;
-        border: 1px solid #E0E0E0;
-        width: 56px
-    }
-
-    h1 {
-        font-family: 'Poppins', sans-serif;
-        font-weight: 600;
-        font-size: 32px;
-        line-height: 39px;
-        margin: 32px 0 24px;
-    }
-
-    .dash p {
-        font-family: 'Poppins', sans-serif;
-        font-weight: 400;
-        font-size: 16px;
-        color: #9E9E9E;
-        margin-bottom: 32px;
-    }
-
-    @media (min-width: 769px) {
-        .dash-section {
-            flex-direction: row;
-        }
-        .dash-section .item {
-            flex: 1;
-        }
-        .picture {
-            height: auto;
-        }
-    }
-
-</style>
-
-<svelte:head>
-	<title>Dashboard</title>
-</svelte:head>
-
-<div class="dashboard-wrapper">
-    <div class="aside" style="display: none;">
-        <p>One Day this will be the Sidebar</p>
-    </div>
-    <div class="dash-section">
-        <div class="item picture"></div>
-        <div class="item dash">
-            <img class="logo" src="https://picsum.photos/seed/picsum/200/200" alt="Platform Login Logo" loading="lazy" width="120">
-            <hr />
-            <h1>Lorem ipsum dolor sit amet.</h1>
-            <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ullam similique assumenda nostrum et maxime ad! Pariatur non provident sequi esse maiores delectus. Aperiam, distinctio quae!</p>
-        <Button 
-            mode="button"
-            color="primary-outline"
-            type="button" 
-            on:click={onSubmit}
-            >START OVER</Button>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/routes/forgot/index.svelte b/src/routes/forgot/index.svelte
deleted file mode 100644
index d2342a2..0000000
--- a/src/routes/forgot/index.svelte
+++ /dev/null
@@ -1,151 +0,0 @@
-<script>
-    import { onMount, onDestroy } from 'svelte';
-    import { goto, stores } from '@sapper/app';
-    import { post } from "auth.js";
-    import { isEmail } from '../../helpers/validate';
-
-    import TextInput from '../../components/UI/TextInput.svelte';
-    import Button from '../../components/UI/Button.svelte';
-
-    const { session } = stores();
-
-    onMount(() => {
-        if (window.innerWidth > 768) {
-            document.querySelector("#sapper > main").style.background = '#F6F6F6';
-        } else {
-            document.querySelector("#sapper > main").style.background = '#FFFFFF';
-        }
-    });
-    
-    onDestroy(() => {
-		document.querySelector("#sapper > main").style.background = '#FFFFFF';
-	});
-
-    let email = '';
-	let password = '';
-    let errors = '';
-    let success = '';
-    let disabled = false;
-
-    async function submit() {
-        console.log('Request Submitted')
-        let emailCheck = isEmail(email);
-        if (!emailCheck) {
-            return errors = "Please enter a valid email address"
-        }
-        const response = await post(`auth/forgot`, { email });
-        console.log('RESPONSE:', response);
-
-        if (response.success === false) {
-            return errors = response.error;
-        }
-
-        if (response.success === true && response.data === "Email sent") {
-            document.getElementById('errorMsg').style.display = "none";
-            disabled = true;
-            success = "Got it, please check your email."
-        }
-    }
-
-</script>
-
-<style>
-    .top-margin {
-        padding-top: 4rem;
-        background: #F6F6F6;
-    }
-    .card-wrapper {
-        width: 100%;
-        margin: 0 auto;
-        background: #FFF;
-    }
-    .card-container {
-        margin: 0 24px;
-        background: #FFF;
-    }
-    .logo-container {
-        display: flex;
-        flex-direction: column;
-    }
-    .logo {
-        width: 120px;
-        margin-top: 48px;
-        margin-bottom: 16px;
-        align-self: center;
-    }
-    h2 {
-        font-family: 'Poppins', sans-serif;
-        font-weight: 400;
-        font-size: 16px;
-        color: rgba(0, 0, 0, 0.87);
-        margin: 16px auto 32px;
-        align-self: center;
-    }
-    .btn-group {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        margin-top: 24px;
-
-    }
-    .btn-item {
-        align-self: center;
-    }
-
-    .error {
-        color: #D93025;
-        font-size: 12px;
-        margin: 0;
-    }
-
-    .success {
-        color: #000;
-        font-size: 12px;
-        margin: 0;
-    }
-
-    @media (min-width: 769px) {
-        .card-wrapper {
-                width: 440px;
-                height: 440px;
-                box-shadow: 0px 1px 3px #00000066;
-                border-radius: 8px;
-            }
-    }
-</style>
-
-<div class="top-margin"></div>
-<div class="card-wrapper">
-    <div class="card-container">
-        <div class="logo-container">
-            <img class="logo" src="https://picsum.photos/seed/picsum/200/200" alt="Platform Login Logo" loading="lazy" width="120">
-            <h2>Enter your email to reset your password.</h2>
-        </div>
-        <form on:submit|preventDefault={submit}>
-            <div class="form-item">
-                <TextInput
-                        type="email"
-                        placeholder="Email"
-                        ariaLabel="email"
-                        value={email}
-                        on:input={event => (email = event.target.value)}
-                        disabled={disabled}
-                    />
-            </div>
-            <div class="btn-group">
-                <p class="error" id="errorMsg">{errors}</p>
-                <p class="success">{success}</p>
-                <div class="btn-item">
-                    <Button 
-                        mode="button"
-                        color="primary"
-                        type="button" 
-                        disabled={!email || disabled === true}
-                        on:click={submit}
-                        >Continue</Button>
-                </div>
-            </div>
-        </form>
-        
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index a4dab19..bca0c38 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -33,15 +33,6 @@
 		margin: 0 0 1em 0;
 	}
 
-<<<<<<< HEAD
-=======
-	img {
-		width: 100%;
-		max-width: 400px;
-		margin: 0 0 1em 0;
-	}
-
->>>>>>> dev
 	@media (min-width: 480px) {
 		h1 {
 			font-size: 4em;
@@ -50,7 +41,6 @@
 </style>
 
 <svelte:head>
-<<<<<<< HEAD
 	<title>Platform | Pure Data Pwnage</title>
 </svelte:head>
 
@@ -59,16 +49,6 @@
 
 	<figure>
 		<img class="mx-auto max-w-sm w-auto" alt='Borat' src='great-success.png'>
-=======
-	<title>Platform</title>
-</svelte:head>
-
-<div class="wrapper">
-	<h1>Great success!</h1>
-
-	<figure>
-		<img alt='Borat' src='great-success.png'>
->>>>>>> dev
 		<figcaption>HIGH FIVE!</figcaption>
 	</figure>
 
diff --git a/src/routes/login/index.svelte b/src/routes/login/index.svelte
deleted file mode 100644
index 0eab319..0000000
--- a/src/routes/login/index.svelte
+++ /dev/null
@@ -1,170 +0,0 @@
-<script>
-    import { onMount, onDestroy } from 'svelte';
-    import { goto, stores } from '@sapper/app';
-    import { post } from "auth.js";
-    import TextInput from '../../components/UI/TextInput.svelte';
-    import Button from '../../components/UI/Button.svelte';
-
-    const { session } = stores();
-
-    onMount(() => {
-        if (window.innerWidth > 768) {
-            document.querySelector("#sapper > main").style.background = '#F6F6F6';
-        } else {
-            document.querySelector("#sapper > main").style.background = '#FFFFFF';
-        }
-    });
-    
-    onDestroy(() => {
-		document.querySelector("#sapper > main").style.background = '#FFFFFF';
-	});
-
-    let email = '';
-	let password = '';
-    let errors = null;
-
-    async function submit() {
-        const response = await post(`auth/login`, { email, password });
-        // TODO handle network errors
-        // errors = response.errors;
-        if(errors) {
-            
-        }
-
-        if (response.user) {
-            $session.user = response.user;
-            $session.token = response.token;
-            goto("/dashboard");
-        }
-    }
-
-</script>
-
-<style>
-    .top-margin {
-        padding-top: 4rem;
-        background: #F6F6F6;
-    }
-    .card-wrapper {
-        display: flex;
-        width: 100%;
-        margin: 0 auto;
-        background: #FFF;
-    }
-    .card-container {
-        width: 100%;
-        margin: 0 24px;
-        background: #FFF;
-    }
-    .logo-container {
-        text-align: center;
-    }
-    .logo {
-        width: 120px;
-        margin-top: 48px;
-        margin-bottom: 16px;
-        align-self: center;
-    }
-    h2 {
-        font-family: 'Poppins', sans-serif;
-        font-weight: 400;
-        font-size: 16px;
-        color: rgba(0, 0, 0, 0.87);
-        margin: 16px auto 32px;
-        align-self: center;
-    }
-
-    .btn-group {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        margin-top: 24px;
-
-    }
-    .btn-item {
-        align-self: center;
-    }
-
-    .link-container {
-        position: absolute;
-        bottom: 32px;
-        left: 50%;
-        transform: translateX(-50%)
-    }
-
-    @media (min-width: 769px) {
-        .card-wrapper {
-            width: 440px;
-            height: 440px;
-            margin: 0 auto;
-            box-shadow: 0px 1px 3px #00000066;
-            border-radius: 8px;
-        }
-
-        .link-container{
-            position: relative;
-            margin: 117px auto 0;
-            text-align: center;
-        }
-    }
-</style>
-<div class="top-margin"></div>
-<div class="card-wrapper">
-    <div class="card-container">
-        <div class="logo-container">
-            <img class="logo" src="https://picsum.photos/seed/picsum/200/200" alt="Platform Login Logo" loading="lazy" width="120">
-            <h2>Sign in to continue to Plateform.</h2>
-        </div>
-        <form on:submit|preventDefault={submit}>
-            <div class="form-item">
-                <TextInput
-                        type="email"
-                        placeholder="Email"
-                        ariaLabel="email"
-                        value={email}
-                        on:input={event => (email = event.target.value)}
-                    />
-            </div>
-            <div class="form-item">
-                <TextInput
-                        controlType="password"
-                        type="password"
-                        placeholder="Password"
-                        ariaLabel="password"
-                        value={password}
-                        on:input={event => (password = event.target.value)}
-                    />
-            </div>
-            <div class="btn-group">
-                <div class="btn-item">
-                    <Button 
-                        mode="link"
-                        color="primary-link"
-                        href="/forgot"
-                        >FORGOT PASSWORD?</Button>
-                </div>
-                <div class="btn-item">
-                    <Button 
-                        mode="button"
-                        color="primary"
-                        type="button" 
-                        disabled={!email || !password}
-                        on:click={submit}
-                        >Login</Button>
-                </div>
-            </div>
-        </form>
-        <div class="link-container">
-            <Button 
-                mode="link"
-                color="secondary-link link-item"
-                href="/terms"
-                >Terms</Button>
-            <Button 
-                mode="link"
-                color="secondary-link link-item"
-                href="/privacy"
-                >Privacy</Button>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/routes/projects.svelte b/src/routes/projects.svelte
deleted file mode 100644
index 1f8c78a..0000000
--- a/src/routes/projects.svelte
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- <script context="module">
-  import * as api from "api.js";
-  export async function preload({}, { token, user }) {
-    return await api.get(`accounts`, token)
-      .then(response => {
-        if (!response.success) {
-            throw new Error("Fetching projects failed, please try again later!");
-        }
-        return response.data;
-      })
-      .then(data => {
-          let legitProjects = []
-          for (const i in data) {
-              for (const x in data[i].accountGroup) {
-                  if (data[i].accountGroup[x] === user._id) {
-                    for (const n in data[i].projects) {
-                        if (data[i].projects[n].projectGroup.includes(user._id)) {
-                            legitProjects.push(data[i].projects[n])
-                        }
-                    }
-                  }
-              }
-          }
-          return { fetchedAccountData: legitProjects };
-      })
-      .catch(err => {
-          console.log(err);
-          this.error(500, "Could not fetch projects!");
-      });
-  }
-</script> -->
-
-<script>
-  import { stores } from "@sapper/app";
-  const { session } = stores();
-  // fetchedAccountData is imported to the client side as props
-  export let fetchedAccountData;
-
-  let isLoading;
-  let unsubscribe;
-  let staticAccountId = '5ed72d8536f9d3189c115f76';
-
-</script>
-
-<div class="header">
-    <!-- <h1>Welcome {user.name.split(' ')[0]}</h1> -->
-    <p>Business is crushing today!</p>
-</div>
-<pre>{JSON.stringify(fetchedAccountData, null, 2)}</pre>
-
-<!-- <hr class="hr-break" />
-
-<h2>Development</h2>
-
-{#each matchedData as project}
-    {#if project.type === "development"}
-        <a href=".">
-        <div class="card fixedWidth">
-            <div class="description">
-                <div class="card-image" />
-                <div class="card-copy">
-                    <h3>{project.project}</h3>
-                    <p>{project._id}</p>
-                </div>
-            </div>
-        </div>
-    </a>
-    {/if}
-{/each} -->
diff --git a/src/routes/projects/index.svelte b/src/routes/projects/index.svelte
deleted file mode 100644
index b63165c..0000000
--- a/src/routes/projects/index.svelte
+++ /dev/null
@@ -1,152 +0,0 @@
-<script context="module">
-import * as api from 'api.js';
-
-  export async function preload({}, { user, token }) {
-    console.log('Server Side User', user)
-    console.log('Server Side Token', token)
-    const projects = await api.get(`projects`, token)
-        .then((response) => {
-            console.log('PROJECTS:', response)
-            return response.data;
-        })
-        .catch(error => console.log('error', error));
-		
-  }
-</script>
-
-<script>
-    import { onMount, onDestroy } from 'svelte';
-    import { stores } from '@sapper/app';
-    import { post } from 'auth.js';
-
-    const { session } = stores();
-    console.log('client-side user:', $session.user);
-
-    let projects;
-    let inProgress;
-    let errors;
-
-    onMount(async () => {
-		
-	});
-    
-    onDestroy(() => {
-		
-    });
-    
-
-</script>
-
-<style>
-    div.header {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        margin: 0 24px;
-        padding: 32px 0 0;
-    }
-
-    h1 {
-        font-size: 34px;
-        letter-spacing: 0.24px;
-        align-self: center;
-        margin: 0;
-    }
-    i {
-        color: #757575;
-        margin-top: 8px;
-        cursor: pointer;
-    }
-
-    hr {
-        margin: 24px;
-        border: 1px solid #E0E0E0;
-    }
-
-    .hr-break {
-        margin-top: 48px;
-    }
-
-    h2 {
-        font-size: 20px;
-        letter-spacing: 0.24px;
-        margin: 0 0 8px 24px;
-    }
-
-    /* a {
-        text-decoration: none;
-    } 
-    
-    .card {
-      display: flex;
-      flex-direction: column;
-      flex-wrap: nowrap;
-      overflow: hidden;
-      box-shadow: 0px 1px 3px #cccccc;
-      border-radius: 8px;
-      margin: 16px 24px;
-      background: #FFF;
-    }
-
-    .description {
-        display: flex;
-        flex-direction: row;
-        padding: 16px 24px;
-    }
-
-    .card-image {
-        background-image: url('/no-image.png');
-        background-repeat: no-repeat;
-        background-position: center;
-        background-size: contain;
-        min-width: 80px;
-        min-height: 80px;
-        border-radius: 4px;
-    }
-
-    h3 {
-        margin: 0 auto 6px 8px;
-    }
-
-    p {
-        margin: 0 0 0 8px;
-        color: #666666;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-
-    .fixedWidth {
-    max-width: 100%;
-    } */
-</style>
-
-<div class="header">
-    <h1>Your Plateform Projects</h1>
-    <i class="material-icons-outlined">settings</i>
-</div>
-
-<hr />
-
-<h2>Projects</h2>
-
-<pre>{JSON.stringify($projects, null, 2)}</pre>
-
-<!-- {#each Object.keys($projects) as key}
-    <p key={key}>{$projects[key]}</p>
-{/each} -->
-
-
-<!-- {#each $projects as project}
-    <a href=".">
-        <div class="card fixedWidth">
-            <div class="description">
-                <div class="card-image" />
-                <div class="card-copy">
-                    <h3>{project.project}</h3>
-                    <p>{project._id}</p>
-                </div>
-            </div>
-        </div>
-    </a>
-{/each} -->
\ No newline at end of file
diff --git a/src/server.js b/src/server.js
index 40981e0..b4173b2 100644
--- a/src/server.js
+++ b/src/server.js
@@ -15,11 +15,7 @@ const dev = NODE_ENV === 'development';
 polka()
 	.use(bodyParser.json())
 	.use(session({
-<<<<<<< HEAD
 		secret: 'slousberrystoufferforkiki',
-=======
-		secret: 'secret',
->>>>>>> dev
 		resave: false,
 		saveUninitialized: true,
 		cookie: {