homepage merge conflict resolution attempt 2