programmatically removed merge conflicts

[bitNomad]

wrote a script to "accept all incoming" which i believe cleared all of the committed conflict data

ex:

<<<<<<< HEAD
=======
# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17)
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/ableton/__init__.py
# Compiled at: 2021-06-29 09:33:48
# Size of source mod 2**32: 134 bytes
>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
from __future__ import absolute_import, print_function, unicode_literals%

updated:

# decompyle3 version 3.8.0
# Python bytecode 3.7.0 (3394)
# Decompiled from: Python 3.8.9 (default, Mar 30 2022, 13:51:17) 
# [Clang 13.1.6 (clang-1316.0.21.2.3)]
# Embedded file name: output/Live/mac_64_static/Release/python-bundle/MIDI Remote Scripts/ableton/__init__.py
# Compiled at: 2021-06-29 09:33:48
# Size of source mod 2**32: 134 bytes
from __future__ import absolute_import, print_function, unicode_literals

[bitNomad]

added in the @Ideae mergeconflict-fix and upgrade to 11.3.12