attemted fix at unresponsive swipe
resolving conflicts