more safety
resolving conflicts in this lib
fixing lib clash
logging component