fix home page
fixed merge issues