Fix conflicts in common page template