fixed bug in main.py
fixed merge conflict