corrected conflict and checkbox corrected place
corrected