Multiple unresolved merge conflict

[dasbd72]

There are multiple unresolved merge conflicts.

https://github.com/efeslab/Nanoflow/blame/f179a907828b87e042126e585880301ff5b2c62a/auto_search/new_search.py#L17
https://github.com/efeslab/Nanoflow/blame/f179a907828b87e042126e585880301ff5b2c62a/core/worker.py#L6
... and more