home page changes
resolved conflicts