Orlando & Oliver reconciled

Orlando & Oliver reconciled