bug merging sfs