Fix merge conflict

Authored by vkrause on Sep 30 2017, 1:51 PM.