diff --git a/receiving.go b/receiving.go
index 2f329da..77c4d57 100644
--- a/receiving.go
+++ b/receiving.go
@@ -116,6 +116,7 @@ type Payload struct {
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	Title string `json:"title,omitempty"`
 =======
@@ -128,7 +129,16 @@ type Payload struct {
 >>>>>>> 46e5525 (Add title to payload)
 =======
 >>>>>>> 0a2552c (Merge pull request #1 from Neur0toxine/master)
+<<<<<<< HEAD
 >>>>>>> 432a6ee (Merge pull request #1 from Neur0toxine/master)
+=======
+=======
+	Title string `json:"title,omitempty"`
+>>>>>>> 46e5525 (Add title to payload)
+=======
+	Title string `json:"title,omitempty"`
+>>>>>>> 1d59bfd (add title to payload)
+>>>>>>> dcfe8d3 (add title to payload)
 	// Coordinates is Lat/Long pair of location pin
 	Coordinates *Coordinates `json:"coordinates,omitempty"`
 }