rebuild server
merge