Using daily rotating log files
resolving conflicts