SITCON-tgBot says to #sitcon <NoobTW>: The "I have merge conflicts, but I know that one version is the correct one" Trick, a.k.a. "Ours vs. Theirs"