Client registration
merge