home page new designs
fix conflicts