fixing log class merge