Fix issue introduced by merge conflict