Branching Issues - Unable to merge - Supabase