You could do the merge on your computer instead of in the Github UI I guess...