fix(rootfs): remove merge conflict and unnecessary changes.

remove leftovers from merge conflict and test style changes

Author: notmaxx

rootfs/api/models/release.py

@@ -427,7 +427,6 @@ def save(self, *args, **kwargs):  # noqa
                     changes = 'changed limits for '+', '.join(changes)
                     self.summary += "{} {}".format(self.config.owner, changes)
 
-<<<<<<< HEAD
                 # if the lifecycle_post_start hooks changed, log the dict diff
                 changes = []
                 old_lifecycle_post_start = old_config.lifecycle_post_start if old_config else {}

rootfs/bin/test-style

@@ -6,4 +6,4 @@
 # fail hard and fast even on pipelines
 set -eou pipefail
 
-flake8 --show-source --max-line-length=128
+flake8 --show-source