Switched to branch 'branch1'
Auto-merging algo.py
CONFLICT (content): Merge conflict in algo.py
Automatic merge failed; fix conflicts and then commit the result.
--- status:
A  .DS_Store
UU algo.py
A  requirements.txt
