took phil notes
merge