Revert "Revert "Last merge conf""
Revert "Revert "Last merge conf""

This reverts commit 08f9fd16aa2315befd9af7070e5b6d9fe9e760f6.

again 2

davidcluu/civicchallenge-frontend,creativecolab/civicchallenge-frontend