swiping with collection view
Solved conflicts