cypress test - conflict fixes (commit: b1bd793)
Attempt fix for copy course app crash (since merging dev-simplified-onboarding). (commit: 0a5d3a7)
removed useMockEmail change (commit: 56938ba)