backstretch fix for homepage
conflict fix