Fixed swiping on pause bug, working on a collision bug
merge