WS fixes; Remove remnant merge conflict annotation
WS fixes; Remove remnant merge conflict annotation

Tabs to 2 spaces, remove trailing WS
Remnant merge annotation is line 984 and beyond

regan-sarwas/map-series-storytelling-template-js,regan-sarwas/map-series-storytelling-template-js