Remove erroneous merge conflict

Missed this when I merged the logging update, whoops.