Solve RMIServer code conflicts