Tested and removed the <<<< merge changes in main.py