diff --git a/README.md b/README.md
index 2a928a6..652049b 100644
--- a/README.md
+++ b/README.md
@@ -735,7 +735,6 @@ func main() {
 
 #### Default Values for help output
 
-<<<<<<< HEAD
 Sometimes it's useful to specify a flag's default help-text value within the flag declaration. This can be useful if the default value for a flag is a computed value. The default value can be set via the `DefaultText` struct field.
 
 For example this:
@@ -765,9 +764,7 @@ func main() {
       },
     },
   }
-
-=======
->>>>>>> master
+  
   err := app.Run(os.Args)
   if err != nil {
     log.Fatal(err)
@@ -775,15 +772,12 @@ func main() {
 }
 ```
 
-<<<<<<< HEAD
 Will result in help output like:
 
 ```
 --port value  Use a randomized port (default: random)
 ```
 
-=======
->>>>>>> master
 #### Precedence
 
 The precedence for flag value sources is as follows (highest to lowest):
@@ -885,7 +879,6 @@ import (
 )
 
 func main() {
-<<<<<<< HEAD
   app := &cli.App{
     Commands: []*cli.Command{
       {
@@ -899,21 +892,6 @@ func main() {
         Name:     "remove",
         Category: "template",
       },
-=======
-  app := cli.NewApp()
-
-  app.Commands = []cli.Command{
-    {
-      Name: "noop",
-    },
-    {
-      Name:     "add",
-      Category: "Template actions",
-    },
-    {
-      Name:     "remove",
-      Category: "Template actions",
->>>>>>> master
     },
   }
 
diff --git a/appveyor.yml b/appveyor.yml
index 3447d40..1f30f3b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,23 +12,15 @@ cache:
 environment:
   GOPATH: C:\gopath
   GOVERSION: 1.11.x
-<<<<<<< HEAD
   GO111MODULE: on
   GOPROXY: https://proxy.golang.org
-=======
->>>>>>> master
 
 install:
   - set PATH=%GOPATH%\bin;C:\go\bin;%PATH%
   - go version
   - go env
-<<<<<<< HEAD
   - go get github.com/urfave/gfmrun/cmd/gfmrun
   - go mod vendor
-=======
-  - go get github.com/urfave/gfmrun/...
-  - go get -v -t ./...
->>>>>>> master
 
 build_script:
   - go run build.go vet