resolve conflict

resolve conflict in main.py