adding notes
merge