update home page
update home page conflict