comment organization block counter
solving conflicts