merge with clientside