Working leader except for RPC failures
Removing doubled line from merge