homepage merge conflict resolution attempt