Fix bugs when check checkboxes
fix conflict when merge