Fix DiskMemoryConflictsTest
Merge remote-tracking branch 'origin/master'
Make after merge
Make after merge