homepage redesign
fix merge conflict