diff --git a/examples/hello-app/terraform.tfvars b/examples/hello-app/terraform.tfvars
index cbbac10..b739bdc 100644
--- a/examples/hello-app/terraform.tfvars
+++ b/examples/hello-app/terraform.tfvars
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 aws-profile       = "economist-ds-dev"
-=======
-aws-profile       = ""
->>>>>>> e09e0a1ce2c524db201abc769ee90d1d144315f4
 aws-region        = "eu-west-3"