Fix bug home page (1)

Fix bug home page (1) time
Fix conflict

Fix conflict