Pin layers added to the map views and templates
Accept merge conflicts in dist