refactoring logs
merge conflict