Barra + home/album.
Fixes merge conflicts.