Screen flashes when swipe occurs
Merge conflicts