fix merge error
fix #208
Merge error
fix #209
remove toggle link for "show" option of map