You've committed a lot of merge conflicts

[ForsakenHarmony]

AbletonLive11_MIDIRemoteScripts/Push2/track_selection.py

Lines 1 to 23 in ac2a6fe

	<<<<<<< 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/Push2/track_selection.py
	# Compiled at: 2022-01-27 16:28:16
	# Size of source mod 2**32: 12771 bytes
	>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34
	from __future__ import absolute_import, print_function, unicode_literals
	from functools import partial
	import Live
	from ableton.v2.base import EventObject, ObservablePropertyAlias, const, depends, flatten, listenable_property, listens, listens_group, liveobj_changed, liveobj_valid, nop, old_hasattr
	from ableton.v2.control_surface import find_instrument_devices
	from ableton.v2.control_surface.components import ItemProvider, RightAlignTracksTrackAssigner, SessionRingComponent
	<<<<<<< HEAD
	from ableton.v2.control_surface.components.view_control import TrackScroller as TrackScrollerBase
	from ableton.v2.control_surface.components.view_control import ViewControlComponent as ViewControlComponentBase
	=======
	import ableton.v2.control_surface.components.view_control as TrackScrollerBase
	import ableton.v2.control_surface.components.view_control as ViewControlComponentBase
	>>>>>>> d4a7b269eef325b60d6e8b8cc6298fd52c04fa34