fix server lists
merge