Layout home_page
Conflicts resolves