adjust note and source
merge