Restored page with links to avoid conflic merges