remove debug output for release build.
Resolve merge conflicts.
unbreak cmake build - this error might be caused by previous merges with clang tot.