Merging similarity server with master version