Update main.py

This should fix the merging issues with my code.