fixes #4047
Fix merge conflicts.