added new logs
fixed merge