correct mergeing between servers