Change track and album merging to use dictionarys