merged in user change