Added style to home page
conflicts solved