From 37e231a084cd1f2bdc8d086fe13ccd5d9d8ea2e7 Mon Sep 17 00:00:00 2001
From: steull <stephanuller.su@gmail.com>
Date: Fri, 11 Feb 2022 11:26:15 +0000
Subject: [PATCH 1/3] Added new section for new version 1.2.0 #48

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b73c05..087570e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,15 @@ Here is a template for new release sections
 ### Removed
 -
 ```
+
+## [1.2.0] - 20XX-MM-DD
+
+### Added
+-
+### Changed
+-
+### Removed
+
 ## Current
 
 ### [1.1.1]

From 744b4b910113624b506049ce2f1e299a1d1010f9 Mon Sep 17 00:00:00 2001
From: steull <stephanuller.su@gmail.com>
Date: Fri, 11 Feb 2022 11:43:17 +0000
Subject: [PATCH 2/3] Update Test #48

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 087570e..f0a6817 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ Here is a template for new release sections
 ## [1.2.0] - 20XX-MM-DD
 
 ### Added
+Test
 -
 ### Changed
 -

From 63456a364af5887c8452741644717f865c486af8 Mon Sep 17 00:00:00 2001
From: jh-RLI <jonas.huber@rl-institut.de>
Date: Fri, 11 Feb 2022 13:08:07 +0100
Subject: [PATCH 3/3] attempt merge conflict

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0a6817..9372f0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,7 @@ Here is a template for new release sections
 ## [1.2.0] - 20XX-MM-DD
 
 ### Added
-Test
+Test Test merge konflikt
 -
 ### Changed
 -