refine merge process. change test port from 4000 to 4123 to avoid port c...

...onfliction with nomachine daemon.