Fix broken page after mege conflict