73b7a3d1ee
- Always merge state again, so that we keep the missing information from the not updated protocol
- Always merge state again, so that we keep the missing information from the not updated protocol