homepage conflict fix