support page conflict merge, main page footer rendering enhancements