Add nearby secret map
Fix merge conflicts