applied failed hunks manually