new home page
temp changes
merge fixed