check boxes done
Merge