drop them tables
rdio gem stuff
merge conflicts