First try implementing the filesystem
merge