Clean up old merge conflict that I missed.