front-end on multiple pages
fixing merge