resolve merge conflicts from branch basic
adds a logging to some classes