@kristopherw Why/how do you have conflicting commits from two different devs in the first place?