diff --git a/codewars/main.go b/codewars/main.go
index a56b494..87d0740 100644
--- a/codewars/main.go
+++ b/codewars/main.go
@@ -1,23 +1,6 @@
 package main
 
-<<<<<<< Updated upstream
-import "fmt"
 
-func ending(start, end string) bool {
-    // your code here
-	if start[len(start)-len(end):] == end {
-		fmt.Println("true")
-		return true
-	}
-	fmt.Println("false")
-	return false
-
-}
-
-func main() {
-	ending("abc","bc")
-	ending("abc","d")
-=======
 import (
 	"fmt"
 	"strings"
@@ -41,5 +24,4 @@ func main() {
 	ToCamelCase("the-stealth-warrior")
 	// ToCamelCase("The_Stealth_Warrior")
 	// ToCamelCase("The_Stealth-Warrior")
->>>>>>> Stashed changes
 }