add subproject commits for fstmerge, fstcomp