*Cleanup log and timestamps for merge stuff