Fixed the merging issues!

Now you can get the intro!