diff --git a/kmanapp.spec b/kmanapp.spec
index f521861..19bb14d 100644
--- a/kmanapp.spec
+++ b/kmanapp.spec
@@ -1,50 +1,6 @@
-<<<<<<< HEAD
-# -*- mode: python ; coding: utf-8 -*-
-
-block_cipher = None
-
-a = Analysis(['kmanapp.py',
-              'kman.py',
-              'kmanapp_rc.py',
-              'mainwindow.py',
-              'parseweb.py',],
-             pathex=['C:\\Users\\admin\\AppData\\Local\\Programs\\Python\\Python37-32\\Lib\\site-packages\\shiboken2', 'D:\\kman'],
-             binaries=[],
-             datas=[],
-             hiddenimports=[ 'kman', 'kman.kMan', 'kmanapp_rc', 'mainwindow', 'parseweb' ],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          [],
-          exclude_binaries=True,
-          name='kmanapp',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          console=True , icon='kmanapp.ico')
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               upx_exclude=[],
-               name='kmanapp')
-=======
-# -*- mode: python ; coding: utf-8 -*-
 
 block_cipher = None
 
-
 a = Analysis(['kman.py', 'kmanapp.py', 'kmanapp_rc.py', 'mainwindow.py', 'mtable.py', 'parseweb.py', ],
              pathex=['/Users/mark/kman'],
              binaries=[],
@@ -81,4 +37,3 @@ app = BUNDLE(coll,
              name='kmanapp.app',
              icon='kmanapp.ico',
              bundle_identifier=None)
->>>>>>> 2d53124ab9aa26c9733646348174311d0967c8c0