added tunes
fixing merge