added a note from master
fixed merging conflict