diff --git a/examples/go-chat/main.go b/examples/go-chat/main.go
index b225954f..bdbd2ae6 100644
--- a/examples/go-chat/main.go
+++ b/examples/go-chat/main.go
@@ -35,11 +35,7 @@ func main() {
 
 	ctx := context.Background()
 	req := &api.ChatRequest{
-<<<<<<< ours
 		Model:    "llama3.1",
-=======
-		Model:    "llama3ch",
->>>>>>> theirs
 		Messages: messages,
 	}
 
diff --git a/examples/go-generate/main.go b/examples/go-generate/main.go
index 5aae4f12..2fe28742 100644
--- a/examples/go-generate/main.go
+++ b/examples/go-generate/main.go
@@ -15,15 +15,8 @@ func main() {
 	}
 
 	req := &api.GenerateRequest{
-<<<<<<< ours
 		Model:  "gemma2",
 		Prompt: "how many planets are there?",
-=======
-		// Model:  "gemma",
-		Model: "llama3ch",
-		// Prompt: "how many planets are there?",
-		Prompt: "有多少行星？",
->>>>>>> theirs
 
 		// set streaming to false
 		Stream: new(bool),