Recent Visitor to Israel

I live in the United States and recently visited Israel. We saw so much ~ so fast. Two months later I am trying to remember where I was and what happened where.

This evening I saw a History Channel documentory on Masadda which said that Armageddon would happen there.

Yet, when we visited the site of the battle of David and Goliath in the Valley of Elah, our tour guide said This was to be the site of Armageddon.

I'm confused ~ which is it??
Also, on my map I see HaEla Valley....is this the same as Elah Valley??? Different spellings??

Thank you to anyone who can answer some of my questions.