SyntaxError in __init__.py line 1

[fnord-23]

sorry, I know very little about Python (but not new to programming) but I never got any of the scripts to run in Ableton.

The ones I tried now give me a syntax error at line one in init.py.

<<<<<<< HEAD

What is that supposed to mean, do I need to edit the files before they will 'compile' in Ableton?

Thanks

[samsta]

This is because @structurevoid0 made a mistake in aacd611 and commited a whole bunch of merge conflict, as mentioned in issue #8