Resolved merge conflicts and Updated Shows and Cameos Creation