fixing home page issue
merge