Rethinking swipe
conflict resolved