diff --git a/.gitignore b/.gitignore
index bbfa8e16e..cca1f4801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,9 @@ UnitTests/TestResults
 TestResults
 
 # git merge files
-.orig
-.theirs
-.ours
+*.orig
+*.theirs
+*.ours
 
 demo.*
 
diff --git a/GitVersion.yml.orig b/GitVersion.yml.orig
deleted file mode 100644
index 345f7237f..000000000
--- a/GitVersion.yml.orig
+++ /dev/null
@@ -1,103 +0,0 @@
-mode: ContinuousDeployment
-tag-prefix: '[vV]'
-continuous-delivery-fallback-tag: dev
-branches:
-  develop:
-    mode: ContinuousDeployment
-    tag: dev
-    regex: develop
-    source-branches:
-    - main
-    pre-release-weight: 100
-
-  v2_develop:
-    mode: ContinuousDeployment
-    tag: dev
-    regex: ^v2_develop?[/-]
-<<<<<<< HEAD
-    #is-release-branch: true
-=======
->>>>>>> v2_develop
-    tracks-release-branches: true
-    is-source-branch-for: ['v2_release']
-    source-branches: []
-
-  v2_release:
-    mode: ContinuousDeployment
-    tag: prealpha
-    regex: v2_release
-    is-release-branch: true
-    source-branches: ['v2_develop']
-
-  pull-request:
-    mode: ContinuousDeployment
-    tag: PullRequest.{BranchName}
-    increment: Inherit
-    tag-number-pattern: '[/-](?<number>\d+)'
-    regex: ^(pull|pull\-requests|pr)[/-]
-    source-branches:
-    - develop
-    - main
-    - release
-    - v2_develop
-    - v2_release
-    - feature
-    - support
-    - hotfix
-    pre-release-weight: 30000
-
-ignore:
-  sha: []
-
-
-# next-version: 2.0.0
-# mode: ContinuousDeployment
-# tag-prefix: '[vV]'
-# continuous-delivery-fallback-tag: 'pre'
-# branches:
-#   # v1_develop:
-#   #   mode: ContinuousDeployment
-#   #   tag: pre
-#   #   regex: ^v1_develop?[/-]
-#   #   is-release-branch: false
-#   #   source-branches:
-#   #   - v1
-#   # v1:
-#   #   tag: rc
-#   #   increment: Patch
-#   #   regex: ^v2?[/-]
-#   #   is-release-branch: false
-#   #   source-branches: []
-#   #   is-mainline: true
-
-#   v2_develop:
-#     mode: ContinuousDeployment
-#     tag: pre
-#     regex: ^v2_develop?[/-]
-#     is-release-branch: true
-#     tracks-release-branches: true
-#     is-source-branch-for: ['v2']
-#     source-branches: []
-#   v2:
-#     mode: ContinuousDeployment
-#     is-release-branch: false
-#     tag: alpha
-#     increment: Patch
-#     regex: ^v2?[/-]
-#     source-branches: ['v2_develop']
-
-#   # feature:
-#   #   tag: useBranchName
-#   #   regex: ^features?[/-]
-#   #   source-branches:
-#   #   - v1
-#   #   - v1_develop
-#   #   - v2
-#   #   - v2_develop
- 
-#   pull-request:
-#     tag: PullRequest.{BranchName}
-#     increment: Inherit
-# ignore:
-#   sha: []
-# merge-message-formats: {}