added some handling of note conflicts