merge with simple client