github desktop resolve all conflicts