Fixed a bad merge issue and a typo on the map template