resolve conflicts

Signed-off-by: Aditya Anand M C <[email protected]>

marketing landing page

marketing landing page

Merge branch 'stable'

Merge branch 'stable'

updated user directory models/indexers to reflect proper production d… (

gitcoinco#7307)

* updated user directory models/indexers to reflect proper production data set types

* change haystack to use a new env variable to talk to its own cluster

* remove the interpolation of the variable

* update proxyview url

Merge remote-tracking branch 'upstream/stable'

fix projects activity, logo, and urls (gitcoinco#7286)

removes erroneous chat config

Merge remote-tracking branch 'upstream/stable'