diff --git a/docs/resources/resource.md b/docs/resources/resource.md
index bd02e270..0cbd519c 100644
--- a/docs/resources/resource.md
+++ b/docs/resources/resource.md
@@ -34,13 +34,12 @@ resource "twingate_service_account" "github_actions_prod" {
   name = "Github Actions PROD"
 }
 
-<<<<<<< HEAD
 data "twingate_security_policy" "mfa" {
   name = "Default Policy"
-=======
+}
+
 data "twingate_security_policy" "test_policy" {
   name = "Test Policy"
->>>>>>> feature/convert-resource-object
 }
 
 resource "twingate_resource" "resource" {
@@ -48,11 +47,8 @@ resource "twingate_resource" "resource" {
   address = "internal.int"
   remote_network_id = twingate_remote_network.aws_network.id
 
-<<<<<<< HEAD
-=======
   security_policy_id = data.twingate_security_policy.test_policy.id
 
->>>>>>> feature/convert-resource-object
   protocols = {
     allow_icmp = true
     tcp = {
diff --git a/examples/resources/twingate_resource/resource.tf b/examples/resources/twingate_resource/resource.tf
index e5aab84d..0074c988 100644
--- a/examples/resources/twingate_resource/resource.tf
+++ b/examples/resources/twingate_resource/resource.tf
@@ -19,13 +19,12 @@ resource "twingate_service_account" "github_actions_prod" {
   name = "Github Actions PROD"
 }
 
-<<<<<<< HEAD
 data "twingate_security_policy" "mfa" {
   name = "Default Policy"
-=======
+}
+
 data "twingate_security_policy" "test_policy" {
   name = "Test Policy"
->>>>>>> feature/convert-resource-object
 }
 
 resource "twingate_resource" "resource" {
@@ -33,11 +32,8 @@ resource "twingate_resource" "resource" {
   address = "internal.int"
   remote_network_id = twingate_remote_network.aws_network.id
 
-<<<<<<< HEAD
-=======
   security_policy_id = data.twingate_security_policy.test_policy.id
 
->>>>>>> feature/convert-resource-object
   protocols = {
     allow_icmp = true
     tcp = {