github desktop unresolved conflicts