removed tracing
fixed merge errors