swipe
merge fixes