client-side changes propogate correctly
merge: client-side aligned with server-side changes