About page and home page
Resolved conflicts