added tokens for albums
fixed conflicts