new home page
change domain
fix conflicts