fix table conflicts, and add theater_play table