add homepage markup
fix merge conflict