home page content modified in master
conflict from pull merged