fixed the edit show bug where existing shows would not appear in show screen
fixed conflicts