Fixing merge conflict that went unnoticed