update album controller
update album controller
merge conflict with tmp files