removed write log truncation
merged conflicts