diff --git a/eBook/examples/chapter_4/goos.go b/eBook/examples/chapter_4/goos.go
index 9fe9a46..aee6381 100644
--- a/eBook/examples/chapter_4/goos.go
+++ b/eBook/examples/chapter_4/goos.go
@@ -1,25 +1,13 @@
-package main
-<<<<<<< HEAD
-
-=======
->>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541
-import (
-	"fmt"
-	"os"
-)
-<<<<<<< HEAD
-
-func main() {
-	var goos string = os.Getenv("GOOS")
-	fmt.Printf("The operating system is: %s\n", goos)
-	path := os.Getenv("PATH")  
-    fmt.Printf("Path is %s\n", path)
-}
-=======
-func main() {
-	var goos string = os.Getenv("GOOS")
-	fmt.Printf("The operating system is: %s\n", goos)
-	path := os.Getenv("PATH")
-	fmt.Printf("Path is %s\n", path)
-}
->>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+func main() {
+	var goos string = os.Getenv("GOOS")
+	fmt.Printf("The operating system is: %s\n", goos)
+	path := os.Getenv("PATH")
+	fmt.Printf("Path is %s\n", path)
+}
diff --git a/eBook/examples/chapter_4/init.go b/eBook/examples/chapter_4/init.go
index 023e570..3555ce4 100644
--- a/eBook/examples/chapter_4/init.go
+++ b/eBook/examples/chapter_4/init.go
@@ -1,17 +1,9 @@
-package trans
-<<<<<<< HEAD
-
-import "math"
-
-var Pi float64
-
-func init() {
-	Pi = 4 * math.Atan(1) // init() function computes Pi
-}
-=======
-import "math"
-var Pi float64
-func init() {
-	Pi = 4 * math.Atan(1) // init() function computes Pi
-}
->>>>>>> 0364d180eb1d1b8067d1248ace49ca46c816e541
+package trans
+
+import "math"
+
+var Pi float64
+
+func init() {
+	Pi = 4 * math.Atan(1) // init() function computes Pi
+}