Swipes working again
Conflict resolved