updated bugfix on albums controller and deleted unused merge conflict files.