Upload home page and fix merge issues