update mainscene.py - merge issue

merge issue?