homepage step 2
front-page conflict fix