Never mind, their changes are functionally identical to mine. It'll be good to know for future reference though. How do you usually handle conflicting commits in git?