Better handling of protocol conflicts