merge notes
add nfs notes
fix conflict