organize notes
add nfs notes
resolve conflicts