Could someone kindly merge these files correctly please?

[VaLightningThief]

I'd do it myself, but it's long, I'd probably mess up, I'm busy, and don't wanna spend the little time that I get that I could be playing, trying to merge them. Would be a great help thanks

 

[Admixon]

I edited the second file so it looks "pretty"

 

[VaLightningThief]

I edited the second file so it looks "pretty"

Thank you sooo muchhhh

 

[Admixon]

Hope it helps