conflicts github desktop