done with collection view
fix
merge fix