Fixed conflicted kingdoms.txt

I restored the holy_sites though, to stop the crash