removed log file because of merge issue