fix the issue introduced during merge