Added home page
Resolved conflict