Fixed serialization of ballot
fixed merge