index hero img set
merge conflict resolved