removed logging
fixed merge