Git There Are Pending Unresolved Conflicts