fix merge conflict regarding log files