Bug fix on merge user