merging old and new git server