diff --git a/public/templates/home.html b/public/templates/home.html
index 2e0b88e..b1ab0c7 100644
--- a/public/templates/home.html
+++ b/public/templates/home.html
@@ -19,7 +19,7 @@
               <input type="hidden" name="CSRFToken" value={{.CSRFToken}}>
             </div>
             <div class="form-group">
-              
+
               <textarea class="form-control" name="content" id="add-note-content" placeholder="Content" rows="10" style="border:none;border-bottom:1px solid gray; box-shadow:none;"></textarea>
               File: <input	type="file"	name="uploadfile"	/> <br>
               Priority: <select name="priority">
@@ -52,7 +52,11 @@
           <li role="presentation">
               <span class="glyphicon glyphicon-time"></span> {{.Created}}</li>
         <li role="presentation">
+<<<<<<< HEAD
               <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
+=======
+                          <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
+>>>>>>> 474ffbc0ea29e8ccacc707893a07534a4afed961
 						  <span class="glyphicon glyphicon-lock"></span></a></li> 
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
diff --git a/views/views.go b/views/views.go
index 9340ff0..6be1db4 100644
--- a/views/views.go
+++ b/views/views.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"text/template"
 	"time"
+
 )
 
 var homeTemplate *template.Template
@@ -113,6 +114,7 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 		file, handler, err := r.FormFile("uploadfile")
 		if err != nil {
 			log.Println(err)
+<<<<<<< HEAD
 		}
 
 		taskPriority, priorityErr := strconv.Atoi(r.FormValue("priority"))
@@ -129,6 +131,14 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 		content := template.HTMLEscapeString(r.Form.Get("content"))
 		formToken := template.HTMLEscapeString(r.Form.Get("CSRFToken"))
 
+=======
+			return
+		} 
+		title := template.HTMLEscapeString(r.Form.Get("title"))
+		content := template.HTMLEscapeString(r.Form.Get("content"))
+		formToken := template.HTMLEscapeString(r.Form.Get("CSRFToken"))
+		
+>>>>>>> 474ffbc0ea29e8ccacc707893a07534a4afed961
 		cookie, _ := r.Cookie("csrftoken")
 		if formToken == cookie.Value {
 			if handler != nil {
@@ -141,11 +151,19 @@ func AddTaskFunc(w http.ResponseWriter, r *http.Request) {
 				}
 				defer f.Close()
 				io.Copy(f, file)
+<<<<<<< HEAD
 				filelink := "<br> <a href=/files/" + handler.Filename + ">" + handler.Filename + "</a>"
 				content = content + filelink
 			}
 
 			truth := db.AddTask(title, content, taskPriority)
+=======
+				filelink := "<br> <a href=./files/"+handler.Filename+">"+ handler.Filename+"</a>"
+				content =  content + filelink
+			}
+			
+			truth := db.AddTask(title, content)
+>>>>>>> 474ffbc0ea29e8ccacc707893a07534a4afed961
 			if truth != nil {
 				message = "Error adding task"
 				log.Println("error adding task to db")