Fixes #2002 User merge warning logs error