Fixed merge issue on Frontend.py