[FIX] fixed oversight during merge conflict resolution