1 files changed, 4 insertions, 2 deletions

diff --git a/README.md b/README.md
index 138df42..a495a4e 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,15 @@ package main
 
 import (
     "net/url"
+
     "github.com/dougblack/sleepy"
 )
 
 type Item struct {
+<<<<<<< HEAD
     sleepy.BaseResource
+=======
+>>>>>>> da9d8e922d0198a324af1f1b6df97d3e1d5938aa
 }
 
 func (item Item) Get(values url.Values) (int, interface{}) {
@@ -24,13 +28,11 @@ func (item Item) Get(values url.Values) (int, interface{}) {
 }
 
 func main() {
-
     item := new(Item)
 
     var api = new(sleepy.Api)
     api.AddResource(item, "/items")
     api.Start(3000)
-
 }
 ```