diff --git a/0116-vmcore-fix-a-broken-merge-conflict.patch b/0116-vmcore-fix-a-broken-merge-conflict.patch
new file mode 100644
index 0000000..71fff69
--- /dev/null
+++ b/0116-vmcore-fix-a-broken-merge-conflict.patch
@@ -0,0 +1,31 @@
+From 5e5796ce3ec1c57f7dccc2686ebd08f41dadaea8 Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak@redhat.com>
+Date: Wed, 1 Jul 2015 07:31:23 +0200
+Subject: [PATCH] vmcore: fix a broken merge conflict
+
+Resolves: rhbz#1237408
+
+Signed-off-by: Jakub Filak <jfilak@redhat.com>
+---
+ src/hooks/abrt_harvest_vmcore.py.in | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/hooks/abrt_harvest_vmcore.py.in b/src/hooks/abrt_harvest_vmcore.py.in
+index f2bddfe..74d20f7 100644
+--- a/src/hooks/abrt_harvest_vmcore.py.in
++++ b/src/hooks/abrt_harvest_vmcore.py.in
+@@ -155,11 +155,6 @@ def harvest_vmcore():
+         else:
+             break
+ 
+-<<<<<<< HEAD
+-    os.umask(077)
+-
+-=======
+->>>>>>> 71360a6... vmcore: use libreport dd API in the harvestor
+     # Check abrt config files for copy/move settings and
+     try:
+         conf = problem.load_plugin_conf_file("vmcore.conf")
+-- 
+2.4.5
+
diff --git a/abrt.spec b/abrt.spec
index 021d2f2..24f3a6f 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -46,7 +46,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 2.3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://github.com/abrt/abrt/wiki/ABRT-Project
@@ -169,6 +169,7 @@ Patch0112: 0112-vmcore-use-libreport-dd-API-in-the-harvestor.patch
 Patch0113: 0113-ccpp-correct-capitalization-of-log-labels.patch
 Patch0114: 0114-a-a-p-ccpp-analysis-use-ask_yes_no_save_result-inste.patch
 Patch0115: 0115-configui-add-option-always-generate-backtrace-locall.patch
+Patch0116: 0116-vmcore-fix-a-broken-merge-conflict.patch
 
 
 # '%%autosetup -S git' -> git
@@ -1087,6 +1088,10 @@ killall abrt-dbus >/dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
 
 %changelog
+* Wed Jul 01 2015 Jakub Filak <jfilak@redhat.com> - 2.3.0-8
+- vmcore: fix an invalid syntax introduced by the CVE fixes
+- Resolves: #1237408
+
 * Mon Jun 22 2015 Matej Habrnal <mhabrnal@redhat.com> - 2.3.0-7
 - dependency fix