Fix Bug HFS-7 and NFS-8
fix conflict