edit value
fix the bug conflict