finished song
resolved conflict