Fixed merge change to notes file