fixed home page
merging