merge and add gestures
merge changes