took out faulty swipe code
fixed merge conflict"