diff --git a/doc/31-Changelog.md b/doc/31-Changelog.md
index 988783b..821210d 100644
--- a/doc/31-Changelog.md
+++ b/doc/31-Changelog.md
@@ -13,6 +13,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 
 ### Bugfixes
 
+<<<<<<< HEAD
 ## 1.4.1 (2021-03-10)
 
 ### Bugfixes
@@ -20,6 +21,8 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 * [#222](https://github.com/Icinga/icinga-powershell-framework/pull/222) Fixes an issue with [Secure.String] arguments for PowerShell plugins, caused by `ConvertTo-IcingaSecureString` Cmdlet not being pre-loaded
 * [#224](https://github.com/Icinga/icinga-powershell-framework/issues/224) Fixes "memory leak" on background daemon for registered service checks, by clearing the error stack and manually calling the PowerShell garbage collector to force freeing of memory
 
+=======
+>>>>>>> 708729b (Updates version to v1.5.0)
 ## 1.4.0 (2021-03-02)
 
 [Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/11?closed=1)
diff --git a/icinga-powershell-framework.psd1 b/icinga-powershell-framework.psd1
index ff88be1..8446a70 100644
--- a/icinga-powershell-framework.psd1
+++ b/icinga-powershell-framework.psd1
@@ -1,6 +1,6 @@
 @{
     RootModule        = 'icinga-powershell-framework.psm1'
-    ModuleVersion     = '1.4.1'
+    ModuleVersion     = '1.5.0'
     GUID              = 'fcd7a805-a41b-49f9-afee-9d17a2b76d42'
     Author            = 'Lord Hepipud'
     CompanyName       = 'Icinga GmbH'
@@ -81,7 +81,7 @@
             ProjectUri   = 'https://github.com/Icinga/icinga-powershell-framework'
             ReleaseNotes = 'https://github.com/Icinga/icinga-powershell-framework/releases'
         };
-        Version = 'v1.4.1';
+        Version = 'v1.5.0';
     }
     HelpInfoURI       = 'https://github.com/Icinga/icinga-powershell-framework'
 }