Implemented the landing page
Fixed conflicts