update .gitignore
Fixed NFS-5 NFS-6 NFS-7 NFS-8
fix conflicts