Merge conflicts
Merge
Swipe input