Added sharps and flats
merge