change marketing page
resolved conflict