resolved merge conflict
shifted log generation to new class