change the checkboxes' value of "conflict addresses"
Merge remote-tracking branch 'origin/master'