did homepage
Fixed merge issues