Don’t ever use Github’s Mac app’s merge. Ever.