Merge in web client