recommend view with masonry working
merging conflicts
mixing minor issues