fixed notes
merge fix