When recording a new flight selecting a battery which has not been charged since the last flight pops up a dialog in which the user can choose to merge it with the last flight for this battery,
