update setup wizard for server merge