Cleanup BUT Missing Data

I need to find all three music notes (including winged) and the guitar
that goes on the start screen. Shouldn't this have all combined into one
data folder when it merged?
Either way, I'll take EugeneKay's advice:
Commit early, commit often. A tip for version controlling - not for
relationships.