British Airways and bp unite rewards schemes to convert ever