in one of the repositories I work with some other folks on, we use pull requests as a way to manage our merges and sometimes we get merge conflicts (as normally happens). H