added swipeee
fixed merge conflicts