velocity is now in gesture recognizer
resolve conflicts