Merged front-end pages in.
who knows
resolved a conflict