Fix unnoticed merge conflict.