merge
git ignore log files
remove log files