server version merge