More fixes
main.py conflict slved