ignore log files
merge