landingpage and other funny stufff
fixed conflict