albums in the front page
fixed conflict