removed log files
updating
conclude merge