"ours" and "theirs" always confuses me because "theirs" is often mine, so i usually look at the two conflicting patches, which are often annoying to locate, to see which are which and how i should merge them
@pederpbsds