diff --git a/389-admin.spec b/389-admin.spec
index 5082759..41faa37 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -137,7 +137,6 @@ end
 * Tue Feb 20 2018 Mark Reynolds <mreynolds@redhat.com> - 1.1.46-1.6
 - Exclude I86(32 bit) platforms
 
->>>>>>> e02340c... Remove ldconfig is post scriptlets
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.46-1.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild