Resolving Logging Conflict