- Fixed problems with merge on server classes.