fixed server merges