add notes
merge