album model and merge-remote crap that apparently shows up in here as well

hey