fix
added new landingpage
fixed conflicts