some notes
merge