This works better for the client.version
Fix conflicts