Merging from branch to main issue - Supabase