diff --git a/.flake8 b/.flake8
index c68c00eb..e397e8ed 100644
--- a/.flake8
+++ b/.flake8
@@ -1,9 +1,5 @@
 [flake8]
-<<<<<<< HEAD
 max-line-length = 88
-=======
-max-line-length = 80
->>>>>>> 36d2e96... pre-commit, black, isort [ci skip]
 max-complexity = 16
 # B = bugbear
 # B9 = bugbear opinionated (incl line length)
@@ -12,8 +8,5 @@ select = C,E,F,W,B,B9
 # E501: flake8 line length (covered by bugbear B950)
 # W503: line break before binary operator (black behaviour)
 ignore = E203,E501,W503
-<<<<<<< HEAD
 per-file-ignores=
     __init__.py:F401
-=======
->>>>>>> 36d2e96... pre-commit, black, isort [ci skip]
diff --git a/.isort.cfg b/.isort.cfg
index f79d4927..0ec187ef 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -9,13 +9,5 @@ line_length=88
 known_odoo=odoo
 known_odoo_addons=odoo.addons
 sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-<<<<<<< HEAD
-<<<<<<< HEAD
 default_section=THIRDPARTY
 ensure_newline_before_comments = True
-=======
-known_third_party=
->>>>>>> 36d2e96... pre-commit, black, isort [ci skip]
-=======
-default_section=THIRDPARTY
->>>>>>> ea4e737... pre-commit update [ci skip]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c46505e8..c50727d1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
@@ -8,12 +6,6 @@ exclude: |
   ^setup/|/static/description/index\.html$|
   # We don't want to mess with tool-generated files
   .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
-=======
-exclude: |
-  (?x)
-  # Files and folders generated by bots, to avoid loops
-  ^setup/|/static/description/index\.html$|
->>>>>>> ea4e737... pre-commit update [ci skip]
   # Maybe reactivate this when all README files include prettier ignore tags?
   ^README\.md$|
   # Library files can have extraneous formatting (even minimized)
@@ -22,7 +14,6 @@ exclude: |
   ^docs/_templates/.*\.html$|
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
-<<<<<<< HEAD
 default_language_version:
   python: python3
   node: "14.18.0"
@@ -144,165 +135,3 @@ repos:
         args:
           - --rcfile=.pylintrc-mandatory
         additional_dependencies: *pylint_deps
-=======
-exclude: "^setup/|/static/lib/|/static/src/lib/"
-default_language_version:
-  python: python3
-repos:
-- repo: https://github.com/psf/black
-  rev: 19.3b0
-  hooks:
-  - id: black
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
-  hooks:
-  - id: trailing-whitespace
-    # exclude autogenerated files
-    exclude: /README\.rst$|\.pot?$
-  - id: end-of-file-fixer
-    # exclude autogenerated files
-    exclude: /README\.rst$|\.pot?$
-  - id: debug-statements
-  - id: flake8
-    name: flake8 except __init__.py
-    exclude: /__init__\.py$
-    additional_dependencies: ["flake8-bugbear==19.8.0"]
-  - id: flake8
-    name: flake8 only __init__.py
-    args: ["--extend-ignore=F401"]  # ignore unused imports in __init__.py
-    files: /__init__\.py$
-    additional_dependencies: ["flake8-bugbear==19.8.0"]
-  - id: fix-encoding-pragma
-    args: ["--remove"]
-  - id: check-case-conflict
-  - id: check-docstring-first
-  - id: check-executables-have-shebangs
-  - id: check-merge-conflict
-  - id: check-symlinks
-  - id: check-xml
-  - id: mixed-line-ending
-    args: ["--fix=lf"]
-- repo: https://github.com/pre-commit/mirrors-pylint
-  rev: v2.3.1
-  hooks:
-  - id: pylint
-    name: pylint with optional checks
-    args: ["--rcfile=.pylintrc", "--exit-zero"]
-    verbose: true
-    additional_dependencies: ["pylint-odoo==3.0.3"]
-  - id: pylint
-    name: pylint with mandatory checks
-    args: ["--rcfile=.pylintrc-mandatory"]
-    additional_dependencies: ["pylint-odoo==3.0.3"]
-- repo: https://github.com/asottile/pyupgrade
-  rev: v1.24.0
-  hooks:
-  - id: pyupgrade
-- repo: https://github.com/asottile/seed-isort-config
-  rev: v1.9.3
-  hooks:
-  - id: seed-isort-config
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v4.3.21
-  hooks:
-  - id: isort
-    name: isort except __init__.py
-    exclude: /__init__\.py$
-- repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v6.5.1
-  hooks:
-  - id: eslint
-    verbose: true
->>>>>>> 36d2e96... pre-commit, black, isort [ci skip]
-=======
-default_language_version:
-  python: python3
-repos:
-  - repo: https://github.com/psf/black
-    rev: 19.10b0
-    hooks:
-      - id: black
-  - repo: https://github.com/prettier/prettier
-    rev: "1.19.1"
-    hooks:
-      - id: prettier
-  # TODO Avoid awebdeveloper/pre-commit-prettier if possible
-  # HACK https://github.com/prettier/prettier/issues/7407
-  - repo: https://github.com/awebdeveloper/pre-commit-prettier
-    rev: v0.0.1
-    hooks:
-      - id: prettier
-        name: prettier xml plugin
-        additional_dependencies:
-          - "prettier@1.19.1"
-          - "@prettier/plugin-xml@0.7.2"
-        files: \.xml$
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v6.8.0
-    hooks:
-      - id: eslint
-        verbose: true
-        args:
-          - --color
-          - --fix
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
-    hooks:
-      - id: trailing-whitespace
-        # exclude autogenerated files
-        exclude: /README\.rst$|\.pot?$
-      - id: end-of-file-fixer
-        # exclude autogenerated files
-        exclude: /README\.rst$|\.pot?$
-      - id: debug-statements
-      - id: fix-encoding-pragma
-        args: ["--remove"]
-      - id: check-case-conflict
-      - id: check-docstring-first
-      - id: check-executables-have-shebangs
-      - id: check-merge-conflict
-        # exclude files where underlines are not distinguishable from merge conflicts
-        exclude: /README\.rst$|^docs/.*\.rst$
-      - id: check-symlinks
-      - id: check-xml
-      - id: mixed-line-ending
-        args: ["--fix=lf"]
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
-    hooks:
-      - id: flake8
-        name: flake8 except __init__.py
-        exclude: /__init__\.py$
-        additional_dependencies: ["flake8-bugbear==19.8.0"]
-      - id: flake8
-        name: flake8 only __init__.py
-        args: ["--extend-ignore=F401"] # ignore unused imports in __init__.py
-        files: /__init__\.py$
-        additional_dependencies: ["flake8-bugbear==19.8.0"]
-  - repo: https://github.com/pre-commit/mirrors-pylint
-    rev: v2.3.1
-    hooks:
-      - id: pylint
-        name: pylint with optional checks
-        args: ["--rcfile=.pylintrc", "--exit-zero"]
-        verbose: true
-        additional_dependencies: ["pylint-odoo==3.1.0"]
-      - id: pylint
-        name: pylint with mandatory checks
-        args: ["--rcfile=.pylintrc-mandatory"]
-        additional_dependencies: ["pylint-odoo==3.1.0"]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v1.26.2
-    hooks:
-      - id: pyupgrade
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
-    hooks:
-      - id: isort
-        name: isort except __init__.py
-        exclude: /__init__\.py$
-  - repo: https://github.com/acsone/setuptools-odoo
-    rev: 2.5.2
-    hooks:
-      - id: setuptools-odoo-make-default
->>>>>>> ea4e737... pre-commit update [ci skip]
diff --git a/.prettierrc.yml b/.prettierrc.yml
index 2b149ffc..5b6d4b36 100644
--- a/.prettierrc.yml
+++ b/.prettierrc.yml
@@ -5,8 +5,4 @@ printWidth: 88
 proseWrap: always
 semi: true
 trailingComma: "es5"
-<<<<<<< HEAD
 xmlWhitespaceSensitivity: "strict"
-=======
-xmlWhitespaceSensitivity: "ignore"
->>>>>>> ea4e737... pre-commit update [ci skip]
diff --git a/.pylintrc b/.pylintrc
index 087fd744..1163ad83 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -113,6 +113,7 @@ enable=anomalous-backslash-in-string,
     too-complex,
     unnecessary-utf8-coding-comment
 
+
 [REPORTS]
 msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
 output-format=colorized
diff --git a/LICENSE b/LICENSE
index 86dd5042..be3f7b28 100644
--- a/LICENSE
+++ b/LICENSE
@@ -658,12 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<<<<<<< HEAD
-<<<<<<< HEAD
 <https://www.gnu.org/licenses/>.
-=======
-<http://www.gnu.org/licenses/>.
->>>>>>> f5ffc96... [MIG] Add metafiles
-=======
-<http://www.gnu.org/licenses/>.
->>>>>>> 36d2e96... pre-commit, black, isort [ci skip]
diff --git a/sale_product_pack_assisted/__manifest__.py b/sale_product_pack_assisted/__manifest__.py
index 6018d202..3750c557 100644
--- a/sale_product_pack_assisted/__manifest__.py
+++ b/sale_product_pack_assisted/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Assisted Sale product Pack",
-    "version": "13.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Sales",
     "website": "https://github.com/OCA/product-pack",
     "author": "NaN·tic, ADHOC SA, Tecnativa, Odoo Community Association (OCA)",
diff --git a/sale_product_pack_assisted/models/sale_order_line.py b/sale_product_pack_assisted/models/sale_order_line.py
index 050b396c..daa4678c 100644
--- a/sale_product_pack_assisted/models/sale_order_line.py
+++ b/sale_product_pack_assisted/models/sale_order_line.py
@@ -17,7 +17,8 @@ def _onchange_pack_line_ids(self):
             line.price_unit = line.assisted_pack_total
 
     @api.depends(
-        "assisted_pack_line_ids", "assisted_pack_line_ids.price_subtotal",
+        "assisted_pack_line_ids",
+        "assisted_pack_line_ids.price_subtotal",
     )
     def _compute_assisted_pack_total(self):
         for line in self:
diff --git a/sale_product_pack_assisted/models/sale_order_line_pack_line.py b/sale_product_pack_assisted/models/sale_order_line_pack_line.py
index 339a62dc..70d4cd76 100644
--- a/sale_product_pack_assisted/models/sale_order_line_pack_line.py
+++ b/sale_product_pack_assisted/models/sale_order_line_pack_line.py
@@ -14,7 +14,10 @@ class SaleOrderLinePackLine(models.Model):
     )
     product_id = fields.Many2one("product.product", "Product", required=True)
     price_unit = fields.Float("Unit Price", required=True, digits="Product Price")
-    discount = fields.Float("Discount (%)", digits="Discount",)
+    discount = fields.Float(
+        "Discount (%)",
+        digits="Discount",
+    )
     price_subtotal = fields.Float(
         compute="_compute_price_subtotal", string="Subtotal", digits="Account"
     )
diff --git a/setup/sale_product_pack_assisted/odoo/addons/sale_product_pack_assisted b/setup/sale_product_pack_assisted/odoo/addons/sale_product_pack_assisted
new file mode 120000
index 00000000..4262828a
--- /dev/null
+++ b/setup/sale_product_pack_assisted/odoo/addons/sale_product_pack_assisted
@@ -0,0 +1 @@
+../../../../sale_product_pack_assisted
\ No newline at end of file
diff --git a/setup/sale_product_pack_assisted/setup.py b/setup/sale_product_pack_assisted/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/sale_product_pack_assisted/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)