Conflicts solved
Home.css deleted