merging filesystem improvements