At this point they should consider rebasing instead, clearly there's too many conflicts.