Don't hide selected checkboxes
Fix merging conflicts